Finished implementation of Entity