Upgrading version and eliminating DynamicMapResolver.