Add ##user_data_proxy## support