Refactored command stream