Modified generated factories to the provide more accurate rest api