Improved Source creation