Simplified the Entity interface, the removed methods seemed useless.