[FIX][IMP] Make partner maps work properly