Adapt mapping for new and alod communities