Added type parameter to Cell, and fixed some imports