refactoring: Migration from registry code duplication eliminated