Added a custom serializer for Cell
Minor tweaks