Custom Input Data Handler Updated