added attribute mappings