Updated base class to return all