Added Vehicle and Cell classes