Added CustomMap class