Better handling of all datatypes