Adding additional handlers
Changing "Factory" terminology to "Schema"