Fixes mapper file + adds swag helper support