Changes to fit new M-CHanga API