added support for attribute data mappping