Add support for user info