PIM-2261 : make hydrator spec storage specific