* Move to BuddyClient model