added support for custom marker classes