Refactored staging strategy