Move Optional creation into the factories