Added more input params to wrappers to enhance functionality
Added almost all required parts - TODO one input / one output only