Added suppport for manual control in terminal