Changing from INTEGER to more general NUMBER