Feature/buzz integration