Add global underlay support