Fix: Mapping is not applied to public index