Added option to datatype