Added input wrapper