work in progress
Fix schema validation error