Change to make it easier to deserialize by always using Reflection
instead of a generic specialization