added 3 input fields (form handle mapping)