Added option to define data type