Added stuff to EntityId class