Fixed schema references