Added more data type.