Minor change in factory calls