Added a superclass for the entities