Fixing claim updates to allow custom values