Refactored and added commands