Updated BAD to work with recent Asterix changes