Update schema from our aquilon instance

Presenting for review at workshop, some of this may need refactoring.