Refactored underlay creation
Improved underlay behaviour