CZR Refactoring