Improve generateSources() a bit