Map custom leader earlier so things work without having to reimport -_-