Factory optimizations