Add support for user_data