Improve bridge support