Added command routing and better usage.