Added an input wrapper