Fixed generated factories