Added BidiMap from Guava Collections to improve loading time of markers and simplify both the number of data structures used and their appropriateness in the situation