Updating to add a user base class