Add improved source-mapping implementation