Updated CustomInputDataHandler according to Viewer changes