Further improvements to CLI application