Chages to CGMHelper