Improved mapping configuration