Add/remove buddy support