Change heap IDs, make config clearer