Cell and Grid classes added