Add support for multi format