[#3012] Attribute maps added