Improving the structure for the BEM