Added entity hydrator and removed marsallers that were no longer used.