Added Multiple entry points to maps