Added cell variables to cell class