Updates for MBDA 2.1