Changed implementation of cell to hold its ref