Added support for passing in arguments