Stores now extent a base class
Modified marker cluster