Added Olap class