@jonathan PR submitted. I will try to find of a good way to move the expanded tracking to TableRow. I thought about not having a value factory for the expanded column and just extract the expanded state from the tableRow in updateItem. Would that be a good solution or is it bad to render a control inside a column that has a null value? If so, I could use some static/fake value, but that just feels like a bad hack.