Better source map support