Support for different data types added