Simplify the factories