Improved BEM modularity pattern