Improve source map