Refactored gathering commands.