Refactoring and all basic commands