Add source loading
Cleanup src loading