CS - Event add functionality fixes.;