Changed schemas to match front end
Merge pull request #57 from tanvirt/Greg

Changed schemas to match front end