Added support for links and other punctual events