Tweaks to Factory
Variant moved to header