Updated remote class