Json Serializer updated