Refactored commands.