Simplify EntityId class further