Refactored user commands