added map and its specs. refactored specs