Update and consolidate commands