Added support for user attributes