Made it possible to include input arguments