Cell class now contains an entity