Command line options reworked for new options