More modification for using union type for cells