Change Deserializers to support value types

Fixes #546