B Crosstabs: Updated the architecture

Brought into line with classical crosstabs