updated schemas to definitions per #81