Fixup - use JSON serializer afterall