Updated base class in repository