Added support for user ids