added hydrator support...