add support for user-attributes