Added BOA specific stuff.