Commands refactor$