Add doctrine, in preparation for comment implementation.