Refactoring bridge support