Added support for new data formats in Result factory