Updated with data_handler