Added BEM class structure