Options are now properly passed to the command