Code cleanup: marking important entities
Instead of marking the entities in each class, the base class Entity is going to look it up for all of them