Added proper command options