Add events only if needed