Add support for multi-rounds