Add support for around-all