Updating sourcemapext to be more robust