Added current user support