Added Rayfish Json serializer, cleanup