GetCmd complete + refactor