change Map's interface. simpler.