Moved options to commands