Added the support to more data types.