Fix ClientStorage mapping with existing schemas