Updated add/remove op to use getCFEvents(). #8