Add support for integers and floats