Changes for the user_support