Fixed schema resolution strategy