Sychronise with changes to BMM library to support unlimited nested types