Removed custom Json deserializer and added Java Serializable support.