Boundaries map improvements added