Command Parse refactor.