Changes to support using custom marker symbols