Refactored schema to separate concerns better and fixed #13
Merge pull request #14 from VisualGuruz/issue-13

Refactored schema to separate concerns better and fixed #13