Improved source loading