Add support for manual input