Adding number to the primitive types, improving table design