Changed the way to use Schemas
Stable commit to allow FB login