Implemented more efficient version of the Entity class

Removed a few depreciated fields and functions