Fixed schema mapping