Added hydrator class