Bug 32030: ERM - Refactoring