Add support for other numeric datatypes