add some validation
Add new schema