Change client to use buzz service