Added more classes (Id, Direction, Vector)