* Fixed schema field names