Fix for legacy schema mapping