Moved includes method to hydrator