Adding schema and partial validation