adding support for buddy groups