Replaced the old Entity.class with more other classes