Adds support for single point; multiple events