support bws-1.1beta7 changes