Changed name of classes, added table model