Added new code for feature IN-007