Updated schema
Merge remote-tracking branch 'hrabbit/master'