Added new Input wrapper