Rearrange number support
Add all numeric types