Improved source_root