Added command options and defaults