Add support for different data format