Added current user info handling