Multi commands refactor