CommandLine changes.

Changes as per the new core changes