Added the withSources option