Fixed schema conformity