Added support for multiple format