Updated the entities with the new superclass and interface