Futher consolidate commands