Preparations for more bridge handling possibilities