Added proper multimarker support