Third commit of Complex Data Cells