Made hydrator more flexible