Added implementation for some methods in Entity class that I forgot