Modified CLI to be more inline with change mapper