Cleanups
- Add schema validation (using json-schema)