Update to data handler

^ data_handler: Checks