Added mapping hint handling