Changes to prevent duplicate change codes