Updated schema to be more first user friendly.
Merge
Fixed bug in schema file.