diff --git a/Spectrum2/protocol.proto b/Spectrum2/protocol.proto
index cce2a39..180496d 100644
--- a/Spectrum2/protocol.proto
+++ b/Spectrum2/protocol.proto
@@ -89,6 +89,7 @@ message Room {
 message RoomList {
 	repeated string room = 1;
 	repeated string name = 2;
+	optional string user = 3;
 }
 
 enum ParticipantFlag {
@@ -111,6 +112,7 @@ message Participant {
 	optional string statusMessage = 6;
 	optional string newname = 7;
 	optional string iconHash = 8;
+	optional string alias = 9;
 }
 
 message VCard {
@@ -152,6 +154,10 @@ message BackendConfig {
 	required string config = 1;
 }
 
+message APIVersion {
+	required int32 version = 1;
+}
+
 message WrapperMessage {
 	enum Type { 
 		TYPE_CONNECTED 				= 1;
@@ -188,8 +194,10 @@ message WrapperMessage {
 		TYPE_CONV_MESSAGE_ACK		= 33;
 		TYPE_RAW_XML				= 34;
 		TYPE_BUDDIES				= 35;
+		TYPE_API_VERSION			= 36;
 	}
 	required Type type = 1;
 	optional bytes payload = 2;
 }
 ;
+
diff --git a/Spectrum2/protocol_pb2.py b/Spectrum2/protocol_pb2.py
index 83d9d0a..2207e86 100644
--- a/Spectrum2/protocol_pb2.py
+++ b/Spectrum2/protocol_pb2.py
@@ -1,20 +1,28 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: protocol.proto
 
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
 from google.protobuf.internal import enum_type_wrapper
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
 from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
+_sym_db = _symbol_database.Default()
+
 
 
 
 DESCRIPTOR = _descriptor.FileDescriptor(
   name='protocol.proto',
   package='pbnetwork',
-  serialized_pb='\n\x0eprotocol.proto\x12\tpbnetwork\"\x19\n\tConnected\x12\x0c\n\x04user\x18\x01 \x02(\t\"<\n\x0c\x44isconnected\x12\x0c\n\x04user\x18\x01 \x02(\t\x12\r\n\x05\x65rror\x18\x02 \x02(\x05\x12\x0f\n\x07message\x18\x03 \x01(\t\"P\n\x05Login\x12\x0c\n\x04user\x18\x01 \x02(\t\x12\x12\n\nlegacyName\x18\x02 \x02(\t\x12\x10\n\x08password\x18\x03 \x02(\t\x12\x13\n\x0b\x65xtraFields\x18\x04 \x03(\t\"*\n\x06Logout\x12\x0c\n\x04user\x18\x01 \x02(\t\x12\x12\n\nlegacyName\x18\x02 \x02(\t\"\xab\x01\n\x05\x42uddy\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x11\n\tbuddyName\x18\x02 \x02(\t\x12\r\n\x05\x61lias\x18\x03 \x01(\t\x12\r\n\x05group\x18\x04 \x03(\t\x12%\n\x06status\x18\x05 \x01(\x0e\x32\x15.pbnetwork.StatusType\x12\x15\n\rstatusMessage\x18\x06 \x01(\t\x12\x10\n\x08iconHash\x18\x07 \x01(\t\x12\x0f\n\x07\x62locked\x18\x08 \x01(\x08\"*\n\x07\x42uddies\x12\x1f\n\x05\x62uddy\x18\x01 \x03(\x0b\x32\x10.pbnetwork.Buddy\"\xa9\x01\n\x13\x43onversationMessage\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x11\n\tbuddyName\x18\x02 \x02(\t\x12\x0f\n\x07message\x18\x03 \x02(\t\x12\x10\n\x08nickname\x18\x04 \x01(\t\x12\r\n\x05xhtml\x18\x05 \x01(\t\x12\x11\n\ttimestamp\x18\x06 \x01(\t\x12\x10\n\x08headline\x18\x07 \x01(\x08\x12\n\n\x02id\x18\x08 \x01(\t\x12\n\n\x02pm\x18\t \x01(\x08\"J\n\x04Room\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x10\n\x08nickname\x18\x02 \x02(\t\x12\x0c\n\x04room\x18\x03 \x02(\t\x12\x10\n\x08password\x18\x04 \x01(\t\"&\n\x08RoomList\x12\x0c\n\x04room\x18\x01 \x03(\t\x12\x0c\n\x04name\x18\x02 \x03(\t\"\xae\x01\n\x0bParticipant\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x0c\n\x04room\x18\x02 \x02(\t\x12\x10\n\x08nickname\x18\x03 \x02(\t\x12\x0c\n\x04\x66lag\x18\x04 \x02(\x05\x12%\n\x06status\x18\x05 \x02(\x0e\x32\x15.pbnetwork.StatusType\x12\x15\n\rstatusMessage\x18\x06 \x01(\t\x12\x0f\n\x07newname\x18\x07 \x01(\t\x12\x10\n\x08iconHash\x18\x08 \x01(\t\"k\n\x05VCard\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x11\n\tbuddyName\x18\x02 \x02(\t\x12\n\n\x02id\x18\x03 \x02(\x05\x12\x10\n\x08\x66ullname\x18\x04 \x01(\t\x12\x10\n\x08nickname\x18\x05 \x01(\t\x12\r\n\x05photo\x18\x06 \x01(\x0c\"X\n\x06Status\x12\x10\n\x08userName\x18\x01 \x02(\t\x12%\n\x06status\x18\x03 \x02(\x0e\x32\x15.pbnetwork.StatusType\x12\x15\n\rstatusMessage\x18\x04 \x01(\t\"B\n\x05Stats\x12\x0b\n\x03res\x18\x01 \x02(\x05\x12\x10\n\x08init_res\x18\x02 \x02(\x05\x12\x0e\n\x06shared\x18\x03 \x02(\x05\x12\n\n\x02id\x18\x04 \x02(\t\"Y\n\x04\x46ile\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x11\n\tbuddyName\x18\x02 \x02(\t\x12\x10\n\x08\x66ileName\x18\x03 \x02(\t\x12\x0c\n\x04size\x18\x04 \x02(\x05\x12\x0c\n\x04\x66tID\x18\x05 \x01(\x05\".\n\x10\x46ileTransferData\x12\x0c\n\x04\x66tID\x18\x01 \x02(\x05\x12\x0c\n\x04\x64\x61ta\x18\x02 \x02(\x0c\"\x1f\n\rBackendConfig\x12\x0e\n\x06\x63onfig\x18\x01 \x02(\t\"\xac\x06\n\x0eWrapperMessage\x12,\n\x04type\x18\x01 \x02(\x0e\x32\x1e.pbnetwork.WrapperMessage.Type\x12\x0f\n\x07payload\x18\x02 \x01(\x0c\"\xda\x05\n\x04Type\x12\x12\n\x0eTYPE_CONNECTED\x10\x01\x12\x15\n\x11TYPE_DISCONNECTED\x10\x02\x12\x0e\n\nTYPE_LOGIN\x10\x03\x12\x0f\n\x0bTYPE_LOGOUT\x10\x04\x12\x16\n\x12TYPE_BUDDY_CHANGED\x10\x06\x12\x16\n\x12TYPE_BUDDY_REMOVED\x10\x07\x12\x15\n\x11TYPE_CONV_MESSAGE\x10\x08\x12\r\n\tTYPE_PING\x10\t\x12\r\n\tTYPE_PONG\x10\n\x12\x12\n\x0eTYPE_JOIN_ROOM\x10\x0b\x12\x13\n\x0fTYPE_LEAVE_ROOM\x10\x0c\x12\x1c\n\x18TYPE_PARTICIPANT_CHANGED\x10\r\x12\x1e\n\x1aTYPE_ROOM_NICKNAME_CHANGED\x10\x0e\x12\x1d\n\x19TYPE_ROOM_SUBJECT_CHANGED\x10\x0f\x12\x0e\n\nTYPE_VCARD\x10\x10\x12\x17\n\x13TYPE_STATUS_CHANGED\x10\x11\x12\x15\n\x11TYPE_BUDDY_TYPING\x10\x12\x12\x1d\n\x19TYPE_BUDDY_STOPPED_TYPING\x10\x13\x12\x14\n\x10TYPE_BUDDY_TYPED\x10\x14\x12\x15\n\x11TYPE_AUTH_REQUEST\x10\x15\x12\x12\n\x0eTYPE_ATTENTION\x10\x16\x12\x0e\n\nTYPE_STATS\x10\x17\x12\x11\n\rTYPE_FT_START\x10\x18\x12\x12\n\x0eTYPE_FT_FINISH\x10\x19\x12\x10\n\x0cTYPE_FT_DATA\x10\x1a\x12\x11\n\rTYPE_FT_PAUSE\x10\x1b\x12\x14\n\x10TYPE_FT_CONTINUE\x10\x1c\x12\r\n\tTYPE_EXIT\x10\x1d\x12\x17\n\x13TYPE_BACKEND_CONFIG\x10\x1e\x12\x0e\n\nTYPE_QUERY\x10\x1f\x12\x12\n\x0eTYPE_ROOM_LIST\x10 \x12\x19\n\x15TYPE_CONV_MESSAGE_ACK\x10!\x12\x10\n\x0cTYPE_RAW_XML\x10\"\x12\x10\n\x0cTYPE_BUDDIES\x10#*\xb3\x05\n\x0f\x43onnectionError\x12\"\n\x1e\x43ONNECTION_ERROR_NETWORK_ERROR\x10\x00\x12%\n!CONNECTION_ERROR_INVALID_USERNAME\x10\x01\x12*\n&CONNECTION_ERROR_AUTHENTICATION_FAILED\x10\x02\x12.\n*CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE\x10\x03\x12#\n\x1f\x43ONNECTION_ERROR_NO_SSL_SUPPORT\x10\x04\x12%\n!CONNECTION_ERROR_ENCRYPTION_ERROR\x10\x05\x12 \n\x1c\x43ONNECTION_ERROR_NAME_IN_USE\x10\x06\x12%\n!CONNECTION_ERROR_INVALID_SETTINGS\x10\x07\x12&\n\"CONNECTION_ERROR_CERT_NOT_PROVIDED\x10\x08\x12#\n\x1f\x43ONNECTION_ERROR_CERT_UNTRUSTED\x10\t\x12!\n\x1d\x43ONNECTION_ERROR_CERT_EXPIRED\x10\n\x12\'\n#CONNECTION_ERROR_CERT_NOT_ACTIVATED\x10\x0b\x12+\n\'CONNECTION_ERROR_CERT_HOSTNAME_MISMATCH\x10\x0c\x12.\n*CONNECTION_ERROR_CERT_FINGERPRINT_MISMATCH\x10\r\x12%\n!CONNECTION_ERROR_CERT_SELF_SIGNED\x10\x0e\x12%\n!CONNECTION_ERROR_CERT_OTHER_ERROR\x10\x0f\x12 \n\x1c\x43ONNECTION_ERROR_OTHER_ERROR\x10\x10*\x86\x01\n\nStatusType\x12\x11\n\rSTATUS_ONLINE\x10\x00\x12\x0f\n\x0bSTATUS_AWAY\x10\x01\x12\x0e\n\nSTATUS_FFC\x10\x02\x12\r\n\tSTATUS_XA\x10\x03\x12\x0e\n\nSTATUS_DND\x10\x04\x12\x0f\n\x0bSTATUS_NONE\x10\x05\x12\x14\n\x10STATUS_INVISIBLE\x10\x06*\x88\x02\n\x0fParticipantFlag\x12\x19\n\x15PARTICIPANT_FLAG_NONE\x10\x00\x12\x1e\n\x1aPARTICIPANT_FLAG_MODERATOR\x10\x01\x12\x1d\n\x19PARTICIPANT_FLAG_CONFLICT\x10\x02\x12\x1b\n\x17PARTICIPANT_FLAG_BANNED\x10\x04\x12#\n\x1fPARTICIPANT_FLAG_NOT_AUTHORIZED\x10\x08\x12\x17\n\x13PARTICIPANT_FLAG_ME\x10\x10\x12\x1b\n\x17PARTICIPANT_FLAG_KICKED\x10 \x12#\n\x1fPARTICIPANT_FLAG_ROOM_NOT_FOUND\x10@')
+  syntax='proto2',
+  serialized_pb=_b('\n\x0eprotocol.proto\x12\tpbnetwork\"\x19\n\tConnected\x12\x0c\n\x04user\x18\x01 \x02(\t\"<\n\x0c\x44isconnected\x12\x0c\n\x04user\x18\x01 \x02(\t\x12\r\n\x05\x65rror\x18\x02 \x02(\x05\x12\x0f\n\x07message\x18\x03 \x01(\t\"P\n\x05Login\x12\x0c\n\x04user\x18\x01 \x02(\t\x12\x12\n\nlegacyName\x18\x02 \x02(\t\x12\x10\n\x08password\x18\x03 \x02(\t\x12\x13\n\x0b\x65xtraFields\x18\x04 \x03(\t\"*\n\x06Logout\x12\x0c\n\x04user\x18\x01 \x02(\t\x12\x12\n\nlegacyName\x18\x02 \x02(\t\"\xab\x01\n\x05\x42uddy\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x11\n\tbuddyName\x18\x02 \x02(\t\x12\r\n\x05\x61lias\x18\x03 \x01(\t\x12\r\n\x05group\x18\x04 \x03(\t\x12%\n\x06status\x18\x05 \x01(\x0e\x32\x15.pbnetwork.StatusType\x12\x15\n\rstatusMessage\x18\x06 \x01(\t\x12\x10\n\x08iconHash\x18\x07 \x01(\t\x12\x0f\n\x07\x62locked\x18\x08 \x01(\x08\"*\n\x07\x42uddies\x12\x1f\n\x05\x62uddy\x18\x01 \x03(\x0b\x32\x10.pbnetwork.Buddy\"\xa9\x01\n\x13\x43onversationMessage\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x11\n\tbuddyName\x18\x02 \x02(\t\x12\x0f\n\x07message\x18\x03 \x02(\t\x12\x10\n\x08nickname\x18\x04 \x01(\t\x12\r\n\x05xhtml\x18\x05 \x01(\t\x12\x11\n\ttimestamp\x18\x06 \x01(\t\x12\x10\n\x08headline\x18\x07 \x01(\x08\x12\n\n\x02id\x18\x08 \x01(\t\x12\n\n\x02pm\x18\t \x01(\x08\"J\n\x04Room\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x10\n\x08nickname\x18\x02 \x02(\t\x12\x0c\n\x04room\x18\x03 \x02(\t\x12\x10\n\x08password\x18\x04 \x01(\t\"4\n\x08RoomList\x12\x0c\n\x04room\x18\x01 \x03(\t\x12\x0c\n\x04name\x18\x02 \x03(\t\x12\x0c\n\x04user\x18\x03 \x01(\t\"\xbd\x01\n\x0bParticipant\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x0c\n\x04room\x18\x02 \x02(\t\x12\x10\n\x08nickname\x18\x03 \x02(\t\x12\x0c\n\x04\x66lag\x18\x04 \x02(\x05\x12%\n\x06status\x18\x05 \x02(\x0e\x32\x15.pbnetwork.StatusType\x12\x15\n\rstatusMessage\x18\x06 \x01(\t\x12\x0f\n\x07newname\x18\x07 \x01(\t\x12\x10\n\x08iconHash\x18\x08 \x01(\t\x12\r\n\x05\x61lias\x18\t \x01(\t\"k\n\x05VCard\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x11\n\tbuddyName\x18\x02 \x02(\t\x12\n\n\x02id\x18\x03 \x02(\x05\x12\x10\n\x08\x66ullname\x18\x04 \x01(\t\x12\x10\n\x08nickname\x18\x05 \x01(\t\x12\r\n\x05photo\x18\x06 \x01(\x0c\"X\n\x06Status\x12\x10\n\x08userName\x18\x01 \x02(\t\x12%\n\x06status\x18\x03 \x02(\x0e\x32\x15.pbnetwork.StatusType\x12\x15\n\rstatusMessage\x18\x04 \x01(\t\"B\n\x05Stats\x12\x0b\n\x03res\x18\x01 \x02(\x05\x12\x10\n\x08init_res\x18\x02 \x02(\x05\x12\x0e\n\x06shared\x18\x03 \x02(\x05\x12\n\n\x02id\x18\x04 \x02(\t\"Y\n\x04\x46ile\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x11\n\tbuddyName\x18\x02 \x02(\t\x12\x10\n\x08\x66ileName\x18\x03 \x02(\t\x12\x0c\n\x04size\x18\x04 \x02(\x05\x12\x0c\n\x04\x66tID\x18\x05 \x01(\x05\".\n\x10\x46ileTransferData\x12\x0c\n\x04\x66tID\x18\x01 \x02(\x05\x12\x0c\n\x04\x64\x61ta\x18\x02 \x02(\x0c\"\x1f\n\rBackendConfig\x12\x0e\n\x06\x63onfig\x18\x01 \x02(\t\"\x1d\n\nAPIVersion\x12\x0f\n\x07version\x18\x01 \x02(\x05\"\xc2\x06\n\x0eWrapperMessage\x12,\n\x04type\x18\x01 \x02(\x0e\x32\x1e.pbnetwork.WrapperMessage.Type\x12\x0f\n\x07payload\x18\x02 \x01(\x0c\"\xf0\x05\n\x04Type\x12\x12\n\x0eTYPE_CONNECTED\x10\x01\x12\x15\n\x11TYPE_DISCONNECTED\x10\x02\x12\x0e\n\nTYPE_LOGIN\x10\x03\x12\x0f\n\x0bTYPE_LOGOUT\x10\x04\x12\x16\n\x12TYPE_BUDDY_CHANGED\x10\x06\x12\x16\n\x12TYPE_BUDDY_REMOVED\x10\x07\x12\x15\n\x11TYPE_CONV_MESSAGE\x10\x08\x12\r\n\tTYPE_PING\x10\t\x12\r\n\tTYPE_PONG\x10\n\x12\x12\n\x0eTYPE_JOIN_ROOM\x10\x0b\x12\x13\n\x0fTYPE_LEAVE_ROOM\x10\x0c\x12\x1c\n\x18TYPE_PARTICIPANT_CHANGED\x10\r\x12\x1e\n\x1aTYPE_ROOM_NICKNAME_CHANGED\x10\x0e\x12\x1d\n\x19TYPE_ROOM_SUBJECT_CHANGED\x10\x0f\x12\x0e\n\nTYPE_VCARD\x10\x10\x12\x17\n\x13TYPE_STATUS_CHANGED\x10\x11\x12\x15\n\x11TYPE_BUDDY_TYPING\x10\x12\x12\x1d\n\x19TYPE_BUDDY_STOPPED_TYPING\x10\x13\x12\x14\n\x10TYPE_BUDDY_TYPED\x10\x14\x12\x15\n\x11TYPE_AUTH_REQUEST\x10\x15\x12\x12\n\x0eTYPE_ATTENTION\x10\x16\x12\x0e\n\nTYPE_STATS\x10\x17\x12\x11\n\rTYPE_FT_START\x10\x18\x12\x12\n\x0eTYPE_FT_FINISH\x10\x19\x12\x10\n\x0cTYPE_FT_DATA\x10\x1a\x12\x11\n\rTYPE_FT_PAUSE\x10\x1b\x12\x14\n\x10TYPE_FT_CONTINUE\x10\x1c\x12\r\n\tTYPE_EXIT\x10\x1d\x12\x17\n\x13TYPE_BACKEND_CONFIG\x10\x1e\x12\x0e\n\nTYPE_QUERY\x10\x1f\x12\x12\n\x0eTYPE_ROOM_LIST\x10 \x12\x19\n\x15TYPE_CONV_MESSAGE_ACK\x10!\x12\x10\n\x0cTYPE_RAW_XML\x10\"\x12\x10\n\x0cTYPE_BUDDIES\x10#\x12\x14\n\x10TYPE_API_VERSION\x10$*\xb3\x05\n\x0f\x43onnectionError\x12\"\n\x1e\x43ONNECTION_ERROR_NETWORK_ERROR\x10\x00\x12%\n!CONNECTION_ERROR_INVALID_USERNAME\x10\x01\x12*\n&CONNECTION_ERROR_AUTHENTICATION_FAILED\x10\x02\x12.\n*CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE\x10\x03\x12#\n\x1f\x43ONNECTION_ERROR_NO_SSL_SUPPORT\x10\x04\x12%\n!CONNECTION_ERROR_ENCRYPTION_ERROR\x10\x05\x12 \n\x1c\x43ONNECTION_ERROR_NAME_IN_USE\x10\x06\x12%\n!CONNECTION_ERROR_INVALID_SETTINGS\x10\x07\x12&\n\"CONNECTION_ERROR_CERT_NOT_PROVIDED\x10\x08\x12#\n\x1f\x43ONNECTION_ERROR_CERT_UNTRUSTED\x10\t\x12!\n\x1d\x43ONNECTION_ERROR_CERT_EXPIRED\x10\n\x12\'\n#CONNECTION_ERROR_CERT_NOT_ACTIVATED\x10\x0b\x12+\n\'CONNECTION_ERROR_CERT_HOSTNAME_MISMATCH\x10\x0c\x12.\n*CONNECTION_ERROR_CERT_FINGERPRINT_MISMATCH\x10\r\x12%\n!CONNECTION_ERROR_CERT_SELF_SIGNED\x10\x0e\x12%\n!CONNECTION_ERROR_CERT_OTHER_ERROR\x10\x0f\x12 \n\x1c\x43ONNECTION_ERROR_OTHER_ERROR\x10\x10*\x86\x01\n\nStatusType\x12\x11\n\rSTATUS_ONLINE\x10\x00\x12\x0f\n\x0bSTATUS_AWAY\x10\x01\x12\x0e\n\nSTATUS_FFC\x10\x02\x12\r\n\tSTATUS_XA\x10\x03\x12\x0e\n\nSTATUS_DND\x10\x04\x12\x0f\n\x0bSTATUS_NONE\x10\x05\x12\x14\n\x10STATUS_INVISIBLE\x10\x06*\x88\x02\n\x0fParticipantFlag\x12\x19\n\x15PARTICIPANT_FLAG_NONE\x10\x00\x12\x1e\n\x1aPARTICIPANT_FLAG_MODERATOR\x10\x01\x12\x1d\n\x19PARTICIPANT_FLAG_CONFLICT\x10\x02\x12\x1b\n\x17PARTICIPANT_FLAG_BANNED\x10\x04\x12#\n\x1fPARTICIPANT_FLAG_NOT_AUTHORIZED\x10\x08\x12\x17\n\x13PARTICIPANT_FLAG_ME\x10\x10\x12\x1b\n\x17PARTICIPANT_FLAG_KICKED\x10 \x12#\n\x1fPARTICIPANT_FLAG_ROOM_NOT_FOUND\x10@')
+)
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
 _CONNECTIONERROR = _descriptor.EnumDescriptor(
   name='ConnectionError',
@@ -93,9 +101,10 @@ _CONNECTIONERROR = _descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=2182,
-  serialized_end=2873,
+  serialized_start=2264,
+  serialized_end=2955,
 )
+_sym_db.RegisterEnumDescriptor(_CONNECTIONERROR)
 
 ConnectionError = enum_type_wrapper.EnumTypeWrapper(_CONNECTIONERROR)
 _STATUSTYPE = _descriptor.EnumDescriptor(
@@ -135,9 +144,10 @@ _STATUSTYPE = _descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=2876,
-  serialized_end=3010,
+  serialized_start=2958,
+  serialized_end=3092,
 )
+_sym_db.RegisterEnumDescriptor(_STATUSTYPE)
 
 StatusType = enum_type_wrapper.EnumTypeWrapper(_STATUSTYPE)
 _PARTICIPANTFLAG = _descriptor.EnumDescriptor(
@@ -181,9 +191,10 @@ _PARTICIPANTFLAG = _descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=3013,
-  serialized_end=3277,
+  serialized_start=3095,
+  serialized_end=3359,
 )
+_sym_db.RegisterEnumDescriptor(_PARTICIPANTFLAG)
 
 ParticipantFlag = enum_type_wrapper.EnumTypeWrapper(_PARTICIPANTFLAG)
 CONNECTION_ERROR_NETWORK_ERROR = 0
@@ -362,12 +373,17 @@ _WRAPPERMESSAGE_TYPE = _descriptor.EnumDescriptor(
       name='TYPE_BUDDIES', index=33, number=35,
       options=None,
       type=None),
+    _descriptor.EnumValueDescriptor(
+      name='TYPE_API_VERSION', index=34, number=36,
+      options=None,
+      type=None),
   ],
   containing_type=None,
   options=None,
-  serialized_start=1449,
-  serialized_end=2179,
+  serialized_start=1509,
+  serialized_end=2261,
 )
+_sym_db.RegisterEnumDescriptor(_WRAPPERMESSAGE_TYPE)
 
 
 _CONNECTED = _descriptor.Descriptor(
@@ -380,7 +396,7 @@ _CONNECTED = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='user', full_name='pbnetwork.Connected.user', index=0,
       number=1, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -392,7 +408,10 @@ _CONNECTED = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
+  syntax='proto2',
   extension_ranges=[],
+  oneofs=[
+  ],
   serialized_start=29,
   serialized_end=54,
 )
@@ -408,7 +427,7 @@ _DISCONNECTED = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='user', full_name='pbnetwork.Disconnected.user', index=0,
       number=1, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -422,7 +441,7 @@ _DISCONNECTED = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='message', full_name='pbnetwork.Disconnected.message', index=2,
       number=3, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -434,7 +453,10 @@ _DISCONNECTED = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
+  syntax='proto2',
   extension_ranges=[],
+  oneofs=[
+  ],
   serialized_start=56,
   serialized_end=116,
 )
@@ -450,21 +472,21 @@ _LOGIN = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='user', full_name='pbnetwork.Login.user', index=0,
       number=1, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='legacyName', full_name='pbnetwork.Login.legacyName', index=1,
       number=2, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='password', full_name='pbnetwork.Login.password', index=2,
       number=3, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -483,7 +505,10 @@ _LOGIN = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
+  syntax='proto2',
   extension_ranges=[],
+  oneofs=[
+  ],
   serialized_start=118,
   serialized_end=198,
 )
@@ -499,14 +524,14 @@ _LOGOUT = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='user', full_name='pbnetwork.Logout.user', index=0,
       number=1, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='legacyName', full_name='pbnetwork.Logout.legacyName', index=1,
       number=2, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -518,7 +543,10 @@ _LOGOUT = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
+  syntax='proto2',
   extension_ranges=[],
+  oneofs=[
+  ],
   serialized_start=200,
   serialized_end=242,
 )
@@ -534,21 +562,21 @@ _BUDDY = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='userName', full_name='pbnetwork.Buddy.userName', index=0,
       number=1, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='buddyName', full_name='pbnetwork.Buddy.buddyName', index=1,
       number=2, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='alias', full_name='pbnetwork.Buddy.alias', index=2,
       number=3, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -569,14 +597,14 @@ _BUDDY = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='statusMessage', full_name='pbnetwork.Buddy.statusMessage', index=5,
       number=6, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='iconHash', full_name='pbnetwork.Buddy.iconHash', index=6,
       number=7, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -595,7 +623,10 @@ _BUDDY = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
+  syntax='proto2',
   extension_ranges=[],
+  oneofs=[
+  ],
   serialized_start=245,
   serialized_end=416,
 )
@@ -623,7 +654,10 @@ _BUDDIES = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
+  syntax='proto2',
   extension_ranges=[],
+  oneofs=[
+  ],
   serialized_start=418,
   serialized_end=460,
 )
@@ -639,42 +673,42 @@ _CONVERSATIONMESSAGE = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='userName', full_name='pbnetwork.ConversationMessage.userName', index=0,
       number=1, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='buddyName', full_name='pbnetwork.ConversationMessage.buddyName', index=1,
       number=2, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='message', full_name='pbnetwork.ConversationMessage.message', index=2,
       number=3, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='nickname', full_name='pbnetwork.ConversationMessage.nickname', index=3,
       number=4, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='xhtml', full_name='pbnetwork.ConversationMessage.xhtml', index=4,
       number=5, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='timestamp', full_name='pbnetwork.ConversationMessage.timestamp', index=5,
       number=6, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -688,7 +722,7 @@ _CONVERSATIONMESSAGE = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='id', full_name='pbnetwork.ConversationMessage.id', index=7,
       number=8, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -707,7 +741,10 @@ _CONVERSATIONMESSAGE = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
+  syntax='proto2',
   extension_ranges=[],
+  oneofs=[
+  ],
   serialized_start=463,
   serialized_end=632,
 )
@@ -723,28 +760,28 @@ _ROOM = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='userName', full_name='pbnetwork.Room.userName', index=0,
       number=1, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='nickname', full_name='pbnetwork.Room.nickname', index=1,
       number=2, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='room', full_name='pbnetwork.Room.room', index=2,
       number=3, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='password', full_name='pbnetwork.Room.password', index=3,
       number=4, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -756,7 +793,10 @@ _ROOM = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
+  syntax='proto2',
   extension_ranges=[],
+  oneofs=[
+  ],
   serialized_start=634,
   serialized_end=708,
 )
@@ -783,6 +823,13 @@ _ROOMLIST = _descriptor.Descriptor(
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
+    _descriptor.FieldDescriptor(
+      name='user', full_name='pbnetwork.RoomList.user', index=2,
+      number=3, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
   ],
   extensions=[
   ],
@@ -791,9 +838,12 @@ _ROOMLIST = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
+  syntax='proto2',
   extension_ranges=[],
+  oneofs=[
+  ],
   serialized_start=710,
-  serialized_end=748,
+  serialized_end=762,
 )
 
 
@@ -807,21 +857,21 @@ _PARTICIPANT = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='userName', full_name='pbnetwork.Participant.userName', index=0,
       number=1, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='room', full_name='pbnetwork.Participant.room', index=1,
       number=2, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='nickname', full_name='pbnetwork.Participant.nickname', index=2,
       number=3, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -842,21 +892,28 @@ _PARTICIPANT = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='statusMessage', full_name='pbnetwork.Participant.statusMessage', index=5,
       number=6, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='newname', full_name='pbnetwork.Participant.newname', index=6,
       number=7, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='iconHash', full_name='pbnetwork.Participant.iconHash', index=7,
       number=8, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='alias', full_name='pbnetwork.Participant.alias', index=8,
+      number=9, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -868,9 +925,12 @@ _PARTICIPANT = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
+  syntax='proto2',
   extension_ranges=[],
-  serialized_start=751,
-  serialized_end=925,
+  oneofs=[
+  ],
+  serialized_start=765,
+  serialized_end=954,
 )
 
 
@@ -884,14 +944,14 @@ _VCARD = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='userName', full_name='pbnetwork.VCard.userName', index=0,
       number=1, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='buddyName', full_name='pbnetwork.VCard.buddyName', index=1,
       number=2, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -905,21 +965,21 @@ _VCARD = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='fullname', full_name='pbnetwork.VCard.fullname', index=3,
       number=4, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='nickname', full_name='pbnetwork.VCard.nickname', index=4,
       number=5, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='photo', full_name='pbnetwork.VCard.photo', index=5,
       number=6, type=12, cpp_type=9, label=1,
-      has_default_value=False, default_value="",
+      has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -931,9 +991,12 @@ _VCARD = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
+  syntax='proto2',
   extension_ranges=[],
-  serialized_start=927,
-  serialized_end=1034,
+  oneofs=[
+  ],
+  serialized_start=956,
+  serialized_end=1063,
 )
 
 
@@ -947,7 +1010,7 @@ _STATUS = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='userName', full_name='pbnetwork.Status.userName', index=0,
       number=1, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -961,7 +1024,7 @@ _STATUS = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='statusMessage', full_name='pbnetwork.Status.statusMessage', index=2,
       number=4, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -973,9 +1036,12 @@ _STATUS = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
+  syntax='proto2',
   extension_ranges=[],
-  serialized_start=1036,
-  serialized_end=1124,
+  oneofs=[
+  ],
+  serialized_start=1065,
+  serialized_end=1153,
 )
 
 
@@ -1010,7 +1076,7 @@ _STATS = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='id', full_name='pbnetwork.Stats.id', index=3,
       number=4, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -1022,9 +1088,12 @@ _STATS = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
+  syntax='proto2',
   extension_ranges=[],
-  serialized_start=1126,
-  serialized_end=1192,
+  oneofs=[
+  ],
+  serialized_start=1155,
+  serialized_end=1221,
 )
 
 
@@ -1038,21 +1107,21 @@ _FILE = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='userName', full_name='pbnetwork.File.userName', index=0,
       number=1, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='buddyName', full_name='pbnetwork.File.buddyName', index=1,
       number=2, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='fileName', full_name='pbnetwork.File.fileName', index=2,
       number=3, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -1078,9 +1147,12 @@ _FILE = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
+  syntax='proto2',
   extension_ranges=[],
-  serialized_start=1194,
-  serialized_end=1283,
+  oneofs=[
+  ],
+  serialized_start=1223,
+  serialized_end=1312,
 )
 
 
@@ -1101,7 +1173,7 @@ _FILETRANSFERDATA = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='data', full_name='pbnetwork.FileTransferData.data', index=1,
       number=2, type=12, cpp_type=9, label=2,
-      has_default_value=False, default_value="",
+      has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -1113,9 +1185,12 @@ _FILETRANSFERDATA = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
+  syntax='proto2',
   extension_ranges=[],
-  serialized_start=1285,
-  serialized_end=1331,
+  oneofs=[
+  ],
+  serialized_start=1314,
+  serialized_end=1360,
 )
 
 
@@ -1129,7 +1204,7 @@ _BACKENDCONFIG = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='config', full_name='pbnetwork.BackendConfig.config', index=0,
       number=1, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
+      has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -1141,9 +1216,43 @@ _BACKENDCONFIG = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
+  syntax='proto2',
   extension_ranges=[],
-  serialized_start=1333,
-  serialized_end=1364,
+  oneofs=[
+  ],
+  serialized_start=1362,
+  serialized_end=1393,
+)
+
+
+_APIVERSION = _descriptor.Descriptor(
+  name='APIVersion',
+  full_name='pbnetwork.APIVersion',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='version', full_name='pbnetwork.APIVersion.version', index=0,
+      number=1, type=5, cpp_type=1, label=2,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto2',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1395,
+  serialized_end=1424,
 )
 
 
@@ -1164,7 +1273,7 @@ _WRAPPERMESSAGE = _descriptor.Descriptor(
     _descriptor.FieldDescriptor(
       name='payload', full_name='pbnetwork.WrapperMessage.payload', index=1,
       number=2, type=12, cpp_type=9, label=1,
-      has_default_value=False, default_value="",
+      has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -1177,9 +1286,12 @@ _WRAPPERMESSAGE = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
+  syntax='proto2',
   extension_ranges=[],
-  serialized_start=1367,
-  serialized_end=2179,
+  oneofs=[
+  ],
+  serialized_start=1427,
+  serialized_end=2261,
 )
 
 _BUDDY.fields_by_name['status'].enum_type = _STATUSTYPE
@@ -1187,7 +1299,7 @@ _BUDDIES.fields_by_name['buddy'].message_type = _BUDDY
 _PARTICIPANT.fields_by_name['status'].enum_type = _STATUSTYPE
 _STATUS.fields_by_name['status'].enum_type = _STATUSTYPE
 _WRAPPERMESSAGE.fields_by_name['type'].enum_type = _WRAPPERMESSAGE_TYPE
-_WRAPPERMESSAGE_TYPE.containing_type = _WRAPPERMESSAGE;
+_WRAPPERMESSAGE_TYPE.containing_type = _WRAPPERMESSAGE
 DESCRIPTOR.message_types_by_name['Connected'] = _CONNECTED
 DESCRIPTOR.message_types_by_name['Disconnected'] = _DISCONNECTED
 DESCRIPTOR.message_types_by_name['Login'] = _LOGIN
@@ -1204,109 +1316,137 @@ DESCRIPTOR.message_types_by_name['Stats'] = _STATS
 DESCRIPTOR.message_types_by_name['File'] = _FILE
 DESCRIPTOR.message_types_by_name['FileTransferData'] = _FILETRANSFERDATA
 DESCRIPTOR.message_types_by_name['BackendConfig'] = _BACKENDCONFIG
+DESCRIPTOR.message_types_by_name['APIVersion'] = _APIVERSION
 DESCRIPTOR.message_types_by_name['WrapperMessage'] = _WRAPPERMESSAGE
+DESCRIPTOR.enum_types_by_name['ConnectionError'] = _CONNECTIONERROR
+DESCRIPTOR.enum_types_by_name['StatusType'] = _STATUSTYPE
+DESCRIPTOR.enum_types_by_name['ParticipantFlag'] = _PARTICIPANTFLAG
 
-class Connected(_message.Message):
-  __metaclass__ = _reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _CONNECTED
-
+Connected = _reflection.GeneratedProtocolMessageType('Connected', (_message.Message,), dict(
+  DESCRIPTOR = _CONNECTED,
+  __module__ = 'protocol_pb2'
   # @@protoc_insertion_point(class_scope:pbnetwork.Connected)
+  ))
+_sym_db.RegisterMessage(Connected)
 
-class Disconnected(_message.Message):
-  __metaclass__ = _reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _DISCONNECTED
-
+Disconnected = _reflection.GeneratedProtocolMessageType('Disconnected', (_message.Message,), dict(
+  DESCRIPTOR = _DISCONNECTED,
+  __module__ = 'protocol_pb2'
   # @@protoc_insertion_point(class_scope:pbnetwork.Disconnected)
+  ))
+_sym_db.RegisterMessage(Disconnected)
 
-class Login(_message.Message):
-  __metaclass__ = _reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _LOGIN
-
+Login = _reflection.GeneratedProtocolMessageType('Login', (_message.Message,), dict(
+  DESCRIPTOR = _LOGIN,
+  __module__ = 'protocol_pb2'
   # @@protoc_insertion_point(class_scope:pbnetwork.Login)
+  ))
+_sym_db.RegisterMessage(Login)
 
-class Logout(_message.Message):
-  __metaclass__ = _reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _LOGOUT
-
+Logout = _reflection.GeneratedProtocolMessageType('Logout', (_message.Message,), dict(
+  DESCRIPTOR = _LOGOUT,
+  __module__ = 'protocol_pb2'
   # @@protoc_insertion_point(class_scope:pbnetwork.Logout)
+  ))
+_sym_db.RegisterMessage(Logout)
 
-class Buddy(_message.Message):
-  __metaclass__ = _reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _BUDDY
-
+Buddy = _reflection.GeneratedProtocolMessageType('Buddy', (_message.Message,), dict(
+  DESCRIPTOR = _BUDDY,
+  __module__ = 'protocol_pb2'
   # @@protoc_insertion_point(class_scope:pbnetwork.Buddy)
+  ))
+_sym_db.RegisterMessage(Buddy)
 
-class Buddies(_message.Message):
-  __metaclass__ = _reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _BUDDIES
-
+Buddies = _reflection.GeneratedProtocolMessageType('Buddies', (_message.Message,), dict(
+  DESCRIPTOR = _BUDDIES,
+  __module__ = 'protocol_pb2'
   # @@protoc_insertion_point(class_scope:pbnetwork.Buddies)
+  ))
+_sym_db.RegisterMessage(Buddies)
 
-class ConversationMessage(_message.Message):
-  __metaclass__ = _reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _CONVERSATIONMESSAGE
-
+ConversationMessage = _reflection.GeneratedProtocolMessageType('ConversationMessage', (_message.Message,), dict(
+  DESCRIPTOR = _CONVERSATIONMESSAGE,
+  __module__ = 'protocol_pb2'
   # @@protoc_insertion_point(class_scope:pbnetwork.ConversationMessage)
+  ))
+_sym_db.RegisterMessage(ConversationMessage)
 
-class Room(_message.Message):
-  __metaclass__ = _reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _ROOM
-
+Room = _reflection.GeneratedProtocolMessageType('Room', (_message.Message,), dict(
+  DESCRIPTOR = _ROOM,
+  __module__ = 'protocol_pb2'
   # @@protoc_insertion_point(class_scope:pbnetwork.Room)
+  ))
+_sym_db.RegisterMessage(Room)
 
-class RoomList(_message.Message):
-  __metaclass__ = _reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _ROOMLIST
-
+RoomList = _reflection.GeneratedProtocolMessageType('RoomList', (_message.Message,), dict(
+  DESCRIPTOR = _ROOMLIST,
+  __module__ = 'protocol_pb2'
   # @@protoc_insertion_point(class_scope:pbnetwork.RoomList)
+  ))
+_sym_db.RegisterMessage(RoomList)
 
-class Participant(_message.Message):
-  __metaclass__ = _reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _PARTICIPANT
-
+Participant = _reflection.GeneratedProtocolMessageType('Participant', (_message.Message,), dict(
+  DESCRIPTOR = _PARTICIPANT,
+  __module__ = 'protocol_pb2'
   # @@protoc_insertion_point(class_scope:pbnetwork.Participant)
+  ))
+_sym_db.RegisterMessage(Participant)
 
-class VCard(_message.Message):
-  __metaclass__ = _reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _VCARD
-
+VCard = _reflection.GeneratedProtocolMessageType('VCard', (_message.Message,), dict(
+  DESCRIPTOR = _VCARD,
+  __module__ = 'protocol_pb2'
   # @@protoc_insertion_point(class_scope:pbnetwork.VCard)
+  ))
+_sym_db.RegisterMessage(VCard)
 
-class Status(_message.Message):
-  __metaclass__ = _reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _STATUS
-
+Status = _reflection.GeneratedProtocolMessageType('Status', (_message.Message,), dict(
+  DESCRIPTOR = _STATUS,
+  __module__ = 'protocol_pb2'
   # @@protoc_insertion_point(class_scope:pbnetwork.Status)
+  ))
+_sym_db.RegisterMessage(Status)
 
-class Stats(_message.Message):
-  __metaclass__ = _reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _STATS
-
+Stats = _reflection.GeneratedProtocolMessageType('Stats', (_message.Message,), dict(
+  DESCRIPTOR = _STATS,
+  __module__ = 'protocol_pb2'
   # @@protoc_insertion_point(class_scope:pbnetwork.Stats)
+  ))
+_sym_db.RegisterMessage(Stats)
 
-class File(_message.Message):
-  __metaclass__ = _reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _FILE
-
+File = _reflection.GeneratedProtocolMessageType('File', (_message.Message,), dict(
+  DESCRIPTOR = _FILE,
+  __module__ = 'protocol_pb2'
   # @@protoc_insertion_point(class_scope:pbnetwork.File)
+  ))
+_sym_db.RegisterMessage(File)
 
-class FileTransferData(_message.Message):
-  __metaclass__ = _reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _FILETRANSFERDATA
-
+FileTransferData = _reflection.GeneratedProtocolMessageType('FileTransferData', (_message.Message,), dict(
+  DESCRIPTOR = _FILETRANSFERDATA,
+  __module__ = 'protocol_pb2'
   # @@protoc_insertion_point(class_scope:pbnetwork.FileTransferData)
+  ))
+_sym_db.RegisterMessage(FileTransferData)
 
-class BackendConfig(_message.Message):
-  __metaclass__ = _reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _BACKENDCONFIG
-
+BackendConfig = _reflection.GeneratedProtocolMessageType('BackendConfig', (_message.Message,), dict(
+  DESCRIPTOR = _BACKENDCONFIG,
+  __module__ = 'protocol_pb2'
   # @@protoc_insertion_point(class_scope:pbnetwork.BackendConfig)
+  ))
+_sym_db.RegisterMessage(BackendConfig)
 
-class WrapperMessage(_message.Message):
-  __metaclass__ = _reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _WRAPPERMESSAGE
+APIVersion = _reflection.GeneratedProtocolMessageType('APIVersion', (_message.Message,), dict(
+  DESCRIPTOR = _APIVERSION,
+  __module__ = 'protocol_pb2'
+  # @@protoc_insertion_point(class_scope:pbnetwork.APIVersion)
+  ))
+_sym_db.RegisterMessage(APIVersion)
 
+WrapperMessage = _reflection.GeneratedProtocolMessageType('WrapperMessage', (_message.Message,), dict(
+  DESCRIPTOR = _WRAPPERMESSAGE,
+  __module__ = 'protocol_pb2'
   # @@protoc_insertion_point(class_scope:pbnetwork.WrapperMessage)
+  ))
+_sym_db.RegisterMessage(WrapperMessage)
 
 
 # @@protoc_insertion_point(module_scope)
diff --git a/transWhat/transwhat.py b/transWhat/transwhat.py
index 23cc68c..6628eb3 100755
--- a/transWhat/transwhat.py
+++ b/transWhat/transwhat.py
@@ -58,36 +58,36 @@ args, unknown = parser.parse_known_args()
 YowConstants.PATH_STORAGE='/var/lib/spectrum2/' + args.j
 
 if args.log is None:
-	args.log = '/var/log/spectrum2/' + args.j + '/backends/backend.log'
+    args.log = '/var/log/spectrum2/' + args.j + '/backends/backend.log'
 
 # Logging
 logging.basicConfig(
-	filename = args.log,
-	format = "%(asctime)-15s %(levelname)s %(name)s: %(message)s",
-	level = logging.DEBUG if args.debug else logging.INFO
+    filename = args.log,
+    format = "%(asctime)-15s %(levelname)s %(name)s: %(message)s",
+    level = logging.DEBUG if args.debug else logging.INFO
 )
 
 if args.config is not None:
-	specConf = SpectrumConfig(args.config)
+    specConf = SpectrumConfig(args.config)
 else:
-	specConf = None
+    specConf = None
 
 # Handler
 def handleTransportData(data):
-	try:
-		plugin.handleDataRead(data)
-	except SystemExit as e:
-		raise e
-	except:
-		logger = logging.getLogger('transwhat')
-		logger.error(traceback.format_exc())
+    try:
+        plugin.handleDataRead(data)
+    except SystemExit as e:
+        raise e
+    except:
+        logger = logging.getLogger('transwhat')
+        logger.error(traceback.format_exc())
 
 e4u.load()
 
 closed = False
 def connectionClosed():
-	global closed
-	closed = True
+    global closed
+    closed = True
 
 # Main
 io = IOChannel(args.host, args.port, handleTransportData, connectionClosed)
@@ -95,34 +95,34 @@ io = IOChannel(args.host, args.port, handleTransportData, connectionClosed)
 plugin = WhatsAppBackend(io, args.j, specConf)
 
 plugin.handleBackendConfig({
-	'features': [
-		('send_buddies_on_login', 1),
-		('muc', 'true'),
-	],
+    'features': [
+        ('send_buddies_on_login', 1),
+        ('muc', 'true'),
+    ],
 })
 
-
-while True:
-	try:
-		asyncore.loop(timeout=1.0, count=10, use_poll = True)
-		try:
-			callback = YowStack._YowStack__detachedQueue.get(False) #doesn't block
-			callback()
-		except Queue.Empty:
-			pass
-		else:
-			break
-		if closed:
-			break
-		while True:
-			try:
-				callback = threadutils.eventQueue.get_nowait()
-			except Queue.Empty:
-				break
-			else:
-				callback()
-	except SystemExit:
-		break
-	except:
-		logger = logging.getLogger('transwhat')
-		logger.error(traceback.format_exc())
+def main():
+    while True:
+        try:
+            asyncore.loop(timeout=1.0, count=10, use_poll = True)
+            try:
+                callback = YowStack._YowStack__detachedQueue.get(False) #doesn't block
+                callback()
+            except Queue.Empty:
+                pass
+            else:
+                break
+            if closed:
+                break
+            while True:
+                try:
+                    callback = threadutils.eventQueue.get_nowait()
+                except Queue.Empty:
+                    break
+                else:
+                    callback()
+        except SystemExit:
+            break
+        except:
+            logger = logging.getLogger('transwhat')
+            logger.error(traceback.format_exc())