Updated schemas for more configurability.
Merge branch 'test' into dev