Refactored queryable bridge elements