Add passthru state in DataHandler