Added ability to pass options to command