Improved attribute mapping