Simplify Factory usage