Add support for BA 4.8