Use a custom deserializer instead of wrapper types

Use a custom deserializer instead of wrapper types #39