Split query interface into query hydration interface