Map and code changes, moved mapparay declaration to map class