Removed schema validation