KAZOO-2635: continued work on schemas