Added NumberValue support, although I think that variable support should be done better