More changes to enable BSA in different languages