Added registration and buddy send/receive