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