Added new functionality to CellFormatter