Major changes in BOC class and preliminary support for boc calculate method