Add support for numeric and float defaults