Better number handling