Added SHOULD to MUST update for 2.0