Redesign Cell enum