Commands refactor