Added the options factory