Adjust attribute mapping logic for master variant