Added support for current user