Modify schema design on recommendation of @TehShrike
Merge pull request #3 from saibotsivad/master

Modify schema design on recommendation of @TehShrike