Updated schemas to be more first user friendly.
Merge branch 'test' into dev