Added factories to remove new operator from "business" code