Refactored

Added other commands