Switched to decorators for adding commands