Compacted code
Added CellSerializer (previously forgotten)