Refactored commands