Fixed bug on hydrator and added channel model