Add new json align mapping; remove old mapping