Added cell name parsing.