Changed the way Entity works again