- added synchronize to map methods
- remove static methods from map