Extend schema validation
Fix conflicts