Updated for BE 2.8 release