Add Cell class
Improve Cell class