Add old Schema to change
[Fix] schema
Add new validations
Merge pull request #93 from PlumLabs/ed/little_fixes

Little fixes