Added constructor to EntityId