Set of factory methods for Entity is correct now