added current user support