Replaced all sub-Entity constructions with EntityFactory calls.