Update code base to reflect nomlib's API changes with EventDispatcher