Added new options in interactive mode
Some minor changes