Adaptedso that Saiku 3.0 can also be used