Critical updates
Updated CustomInputDataHandler according to Viewer