Refactor/sourcemapindicies

Rework handling of Source Maps.