JAL-1829 JAL-1830 refactoring for correct mapping (de-)registration