Moved "options" into base schema class