Removed Metrics andchanged up how commands are handled