Making inner static class final.
Refactoring map support to use markers.