Added CUPUB support