Add additional datatypes handling