added support for multiple points/labels