More progress on command line framework