Removed the Factory and converted all to nullable options.