Add support for group push