Improved default mapping