Updated ChatTransciever to base repository