Improve the conversion to and from cell values