Enhance dirs loading
1.5.3