Refactored commands
More changes.