diff --git a/aasdk_proto/AVChannelData.proto b/aasdk_proto/AVChannelData.proto
index cddb12e..cb8b8e6 100644
--- a/aasdk_proto/AVChannelData.proto
+++ b/aasdk_proto/AVChannelData.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "AVStreamTypeEnum.proto";
 import "AudioTypeEnum.proto";
@@ -27,9 +27,9 @@ package f1x.aasdk.proto.data;
 
 message AVChannel
 {
-    enums.AVStreamType.Enum stream_type = 1;
-    enums.AudioType.Enum audio_type = 2;
+    required enums.AVStreamType.Enum stream_type = 1;
+    optional enums.AudioType.Enum audio_type = 2;
     repeated AudioConfig audio_configs = 3;
     repeated VideoConfig video_configs = 4;
-    bool available_while_in_call = 5;
+    optional bool available_while_in_call = 5;
 }
diff --git a/aasdk_proto/AVChannelMessageIdsEnum.proto b/aasdk_proto/AVChannelMessageIdsEnum.proto
index c3baaa0..67f0c06 100644
--- a/aasdk_proto/AVChannelMessageIdsEnum.proto
+++ b/aasdk_proto/AVChannelMessageIdsEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.ids;
 
diff --git a/aasdk_proto/AVChannelSetupRequestMessage.proto b/aasdk_proto/AVChannelSetupRequestMessage.proto
index 34cb585..fae2192 100644
--- a/aasdk_proto/AVChannelSetupRequestMessage.proto
+++ b/aasdk_proto/AVChannelSetupRequestMessage.proto
@@ -16,11 +16,11 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.messages;
 
 message AVChannelSetupRequest
 {
-	uint32 config_index = 1;
+	required uint32 config_index = 1;
 }
diff --git a/aasdk_proto/AVChannelSetupStatusEnum.proto b/aasdk_proto/AVChannelSetupStatusEnum.proto
index 3c56fdd..68b4ee9 100644
--- a/aasdk_proto/AVChannelSetupStatusEnum.proto
+++ b/aasdk_proto/AVChannelSetupStatusEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/AVChannelStartIndicationMessage.proto b/aasdk_proto/AVChannelStartIndicationMessage.proto
index 424759d..30ded14 100644
--- a/aasdk_proto/AVChannelStartIndicationMessage.proto
+++ b/aasdk_proto/AVChannelStartIndicationMessage.proto
@@ -16,12 +16,12 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.messages;
 
 message AVChannelStartIndication
 {
-    int32 session = 1;
-    uint32 config = 2;
+    required int32 session = 1;
+    required uint32 config = 2;
 }
diff --git a/aasdk_proto/AVChannelStopIndicationMessage.proto b/aasdk_proto/AVChannelStopIndicationMessage.proto
index 4d8a3b6..1ff7b7d 100644
--- a/aasdk_proto/AVChannelStopIndicationMessage.proto
+++ b/aasdk_proto/AVChannelStopIndicationMessage.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.messages;
 
diff --git a/aasdk_proto/AVInputChannelData.proto b/aasdk_proto/AVInputChannelData.proto
index 5d85432..8165107 100644
--- a/aasdk_proto/AVInputChannelData.proto
+++ b/aasdk_proto/AVInputChannelData.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "AVStreamTypeEnum.proto";
 import "AudioConfigData.proto";
@@ -25,7 +25,7 @@ package f1x.aasdk.proto.data;
 
 message AVInputChannel
 {
-    enums.AVStreamType.Enum stream_type = 1;
-    AudioConfig audio_config = 2;
-    bool available_while_in_call = 3;
+    required enums.AVStreamType.Enum stream_type = 1;
+    required AudioConfig audio_config = 2;
+    optional bool available_while_in_call = 3;
 }
diff --git a/aasdk_proto/AVInputOpenRequestMessage.proto b/aasdk_proto/AVInputOpenRequestMessage.proto
index 4d9de26..496ee4b 100644
--- a/aasdk_proto/AVInputOpenRequestMessage.proto
+++ b/aasdk_proto/AVInputOpenRequestMessage.proto
@@ -16,14 +16,14 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.messages;
 
 message AVInputOpenRequest
 {
-	bool open = 1;
-	bool anc = 2;
-	bool ec = 3;
-	int32 max_unacked = 4;
+	required bool open = 1;
+	optional bool anc = 2;
+	optional bool ec = 3;
+	optional int32 max_unacked = 4;
 }
diff --git a/aasdk_proto/AVStreamTypeEnum.proto b/aasdk_proto/AVStreamTypeEnum.proto
index a52fa84..3a1ffd1 100644
--- a/aasdk_proto/AVStreamTypeEnum.proto
+++ b/aasdk_proto/AVStreamTypeEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/AbsoluteInputEventData.proto b/aasdk_proto/AbsoluteInputEventData.proto
index 1287938..afcdde9 100644
--- a/aasdk_proto/AbsoluteInputEventData.proto
+++ b/aasdk_proto/AbsoluteInputEventData.proto
@@ -16,12 +16,12 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message AbsoluteInputEvent
 {
-    uint32 scan_code = 1;
-    int32 value = 2;
+    required uint32 scan_code = 1;
+    required int32 value = 2;
 }
diff --git a/aasdk_proto/AbsoluteInputEventsData.proto b/aasdk_proto/AbsoluteInputEventsData.proto
index 0576bd4..29f61f4 100644
--- a/aasdk_proto/AbsoluteInputEventsData.proto
+++ b/aasdk_proto/AbsoluteInputEventsData.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "AbsoluteInputEventData.proto";
 
diff --git a/aasdk_proto/AccelData.proto b/aasdk_proto/AccelData.proto
index 61fa1cf..f873ed7 100644
--- a/aasdk_proto/AccelData.proto
+++ b/aasdk_proto/AccelData.proto
@@ -16,13 +16,13 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message Accel
 {
-    int32 acceleration_x = 1;
-    int32 acceleration_y = 2;
-    int32 acceleration_z = 3;
+    required int32 acceleration_x = 1;
+    required int32 acceleration_y = 2;
+    required int32 acceleration_z = 3;
 }
diff --git a/aasdk_proto/AudioConfigData.proto b/aasdk_proto/AudioConfigData.proto
index 2032285..8b4ba85 100644
--- a/aasdk_proto/AudioConfigData.proto
+++ b/aasdk_proto/AudioConfigData.proto
@@ -16,13 +16,13 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message AudioConfig
 {
-    uint32 sample_rate = 1;
-    uint32 bit_depth = 2;
-    uint32 channel_count = 3;
+    required uint32 sample_rate = 1;
+    required uint32 bit_depth = 2;
+    required uint32 channel_count = 3;
 }
diff --git a/aasdk_proto/AudioFocusRequestMessage.proto b/aasdk_proto/AudioFocusRequestMessage.proto
index 0fb91ae..1273cfc 100644
--- a/aasdk_proto/AudioFocusRequestMessage.proto
+++ b/aasdk_proto/AudioFocusRequestMessage.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "AudioFocusTypeEnum.proto";
 
@@ -24,5 +24,5 @@ package f1x.aasdk.proto.messages;
 
 message AudioFocusRequest
 {
-    enums.AudioFocusType.Enum audio_focus_type = 1;
+    required enums.AudioFocusType.Enum audio_focus_type = 1;
 }
diff --git a/aasdk_proto/AudioFocusResponseMessage.proto b/aasdk_proto/AudioFocusResponseMessage.proto
index 634eb8c..43e7cd7 100644
--- a/aasdk_proto/AudioFocusResponseMessage.proto
+++ b/aasdk_proto/AudioFocusResponseMessage.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "AudioFocusStateEnum.proto";
 
@@ -24,5 +24,5 @@ package f1x.aasdk.proto.messages;
 
 message AudioFocusResponse
 {
-    enums.AudioFocusState.Enum audio_focus_state = 1;
+    required enums.AudioFocusState.Enum audio_focus_state = 1;
 }
diff --git a/aasdk_proto/AudioFocusStateEnum.proto b/aasdk_proto/AudioFocusStateEnum.proto
index b334fff..1200cdc 100644
--- a/aasdk_proto/AudioFocusStateEnum.proto
+++ b/aasdk_proto/AudioFocusStateEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/AudioFocusTypeEnum.proto b/aasdk_proto/AudioFocusTypeEnum.proto
index 0e6677a..73e7877 100644
--- a/aasdk_proto/AudioFocusTypeEnum.proto
+++ b/aasdk_proto/AudioFocusTypeEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/AudioTypeEnum.proto b/aasdk_proto/AudioTypeEnum.proto
index 44744f4..255bab9 100644
--- a/aasdk_proto/AudioTypeEnum.proto
+++ b/aasdk_proto/AudioTypeEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/BindingRequestMessage.proto b/aasdk_proto/BindingRequestMessage.proto
index b11c3d4..a0b80fa 100644
--- a/aasdk_proto/BindingRequestMessage.proto
+++ b/aasdk_proto/BindingRequestMessage.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.messages;
 
diff --git a/aasdk_proto/BluetoothChannelData.proto b/aasdk_proto/BluetoothChannelData.proto
index 780ea44..31fbdc4 100644
--- a/aasdk_proto/BluetoothChannelData.proto
+++ b/aasdk_proto/BluetoothChannelData.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "BluetoothPairingMethodEnum.proto";
 
@@ -24,6 +24,6 @@ package f1x.aasdk.proto.data;
 
 message BluetoothChannel
 {
-    string adapter_address = 1;
+    required string adapter_address = 1;
     repeated enums.BluetoothPairingMethod.Enum supported_pairing_methods = 2;
 }
diff --git a/aasdk_proto/BluetoothChannelMessageIdsEnum.proto b/aasdk_proto/BluetoothChannelMessageIdsEnum.proto
index 30ac80e..33ed3e6 100644
--- a/aasdk_proto/BluetoothChannelMessageIdsEnum.proto
+++ b/aasdk_proto/BluetoothChannelMessageIdsEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.ids;
 
diff --git a/aasdk_proto/BluetoothPairingMethodEnum.proto b/aasdk_proto/BluetoothPairingMethodEnum.proto
index 18591d6..a7b8b9a 100644
--- a/aasdk_proto/BluetoothPairingMethodEnum.proto
+++ b/aasdk_proto/BluetoothPairingMethodEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/BluetoothPairingRequestMessage.proto b/aasdk_proto/BluetoothPairingRequestMessage.proto
index 91bbea7..7daf8fe 100644
--- a/aasdk_proto/BluetoothPairingRequestMessage.proto
+++ b/aasdk_proto/BluetoothPairingRequestMessage.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "BluetoothPairingMethodEnum.proto";
 
@@ -24,6 +24,6 @@ package f1x.aasdk.proto.messages;
 
 message BluetoothPairingRequest
 {
-    string phone_address = 1;
-    enums.BluetoothPairingMethod.Enum pairing_method = 2;
+    required string phone_address = 1;
+    required enums.BluetoothPairingMethod.Enum pairing_method = 2;
 }
diff --git a/aasdk_proto/BluetoothPairingResponseMessage.proto b/aasdk_proto/BluetoothPairingResponseMessage.proto
index dd90169..6045a83 100644
--- a/aasdk_proto/BluetoothPairingResponseMessage.proto
+++ b/aasdk_proto/BluetoothPairingResponseMessage.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "BluetoothPairingStatusEnum.proto";
 
@@ -24,6 +24,6 @@ package f1x.aasdk.proto.messages;
 
 message BluetoothPairingResponse
 {
-    bool already_paired = 1;
-    enums.BluetoothPairingStatus.Enum status = 2;
+    required bool already_paired = 1;
+    required enums.BluetoothPairingStatus.Enum status = 2;
 }
diff --git a/aasdk_proto/BluetoothPairingStatusEnum.proto b/aasdk_proto/BluetoothPairingStatusEnum.proto
index 4d71a34..128de52 100644
--- a/aasdk_proto/BluetoothPairingStatusEnum.proto
+++ b/aasdk_proto/BluetoothPairingStatusEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/ButtonCodeEnum.proto b/aasdk_proto/ButtonCodeEnum.proto
index 63e36bb..7832e3e 100644
--- a/aasdk_proto/ButtonCodeEnum.proto
+++ b/aasdk_proto/ButtonCodeEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/ButtonEventData.proto b/aasdk_proto/ButtonEventData.proto
index 88bc718..6b9f0dd 100644
--- a/aasdk_proto/ButtonEventData.proto
+++ b/aasdk_proto/ButtonEventData.proto
@@ -16,14 +16,14 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message ButtonEvent
 {
-    uint32 scan_code = 1;
-    bool is_pressed = 2;
-    uint32 meta = 3;
-    bool long_press = 4;
+    required uint32 scan_code = 1;
+    required bool is_pressed = 2;
+    optional uint32 meta = 3;
+    optional bool long_press = 4;
 }
diff --git a/aasdk_proto/ButtonEventsData.proto b/aasdk_proto/ButtonEventsData.proto
index ae26a12..0141c67 100644
--- a/aasdk_proto/ButtonEventsData.proto
+++ b/aasdk_proto/ButtonEventsData.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "ButtonEventData.proto";
 
diff --git a/aasdk_proto/ChannelDescriptorData.proto b/aasdk_proto/ChannelDescriptorData.proto
index c167c28..447ed58 100644
--- a/aasdk_proto/ChannelDescriptorData.proto
+++ b/aasdk_proto/ChannelDescriptorData.proto
@@ -16,7 +16,9 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
+
+option optimize_for=SPEED;
 
 import "SensorChannelData.proto";
 import "AVChannelData.proto";
@@ -25,17 +27,21 @@ import "AVInputChannelData.proto";
 import "BluetoothChannelData.proto";
 import "NavigationChannelData.proto";
 import "VendorExtensionChannelData.proto";
+import "MediaChannelData.proto";
+import "WifiChannelData.proto";
 
 package f1x.aasdk.proto.data;
 
 message ChannelDescriptor
 {
-    uint32 channel_id = 1;
-    SensorChannel sensor_channel = 2;
-    AVChannel av_channel = 3;
-    InputChannel input_channel = 4;
-    AVInputChannel av_input_channel = 5;
-    BluetoothChannel bluetooth_channel = 6;
-    NavigationChannel navigation_channel = 8;
-    VendorExtensionChannel vendor_extension_channel = 12;
+    required uint32 channel_id = 1;
+    optional SensorChannel sensor_channel = 2;
+    optional AVChannel av_channel = 3;
+    optional InputChannel input_channel = 4;
+    optional AVInputChannel av_input_channel = 5;
+    optional BluetoothChannel bluetooth_channel = 6;
+    optional NavigationChannel navigation_channel = 8;
+    optional MediaInfoChannel media_infoChannel = 9;
+    optional VendorExtensionChannel vendor_extension_channel = 12;
+    optional WifiChannel wifi_channel=16;
 }
diff --git a/aasdk_proto/ChannelOpenRequestMessage.proto b/aasdk_proto/ChannelOpenRequestMessage.proto
index f7e8506..18c42a3 100644
--- a/aasdk_proto/ChannelOpenRequestMessage.proto
+++ b/aasdk_proto/ChannelOpenRequestMessage.proto
@@ -16,12 +16,12 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.messages;
 
 message ChannelOpenRequest
 {
-    int32 priority = 1;
-    int32 channel_id = 2;
+    required int32 priority = 1;
+    required int32 channel_id = 2;
 }
diff --git a/aasdk_proto/CompassData.proto b/aasdk_proto/CompassData.proto
index 3e821de..73af7fa 100644
--- a/aasdk_proto/CompassData.proto
+++ b/aasdk_proto/CompassData.proto
@@ -16,13 +16,13 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message Compass
 {
-    int32 bearing =1;
-    int32 pitch = 2;
-    int32 roll = 3;
+    required int32 bearing =1;
+    required int32 pitch = 2;
+    required int32 roll = 3;
 }
diff --git a/aasdk_proto/ControlMessageIdsEnum.proto b/aasdk_proto/ControlMessageIdsEnum.proto
index 9d527cd..76fe538 100644
--- a/aasdk_proto/ControlMessageIdsEnum.proto
+++ b/aasdk_proto/ControlMessageIdsEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.ids;
 
diff --git a/aasdk_proto/DiagnosticsData.proto b/aasdk_proto/DiagnosticsData.proto
index cb7e51c..5b7e339 100644
--- a/aasdk_proto/DiagnosticsData.proto
+++ b/aasdk_proto/DiagnosticsData.proto
@@ -16,11 +16,11 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message Diagnostics
 {
-    bytes diagnostics = 1;
+    required bytes diagnostics = 1;
 }
diff --git a/aasdk_proto/DoorData.proto b/aasdk_proto/DoorData.proto
index e6f6eac..3c138d5 100644
--- a/aasdk_proto/DoorData.proto
+++ b/aasdk_proto/DoorData.proto
@@ -16,13 +16,13 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message Door
 {
-    bool hood_open = 1;
-    bool boot_open = 2;
+    required bool hood_open = 1;
+    required bool boot_open = 2;
     repeated bool door_open = 3;
 }
diff --git a/aasdk_proto/DrivingStatusEnum.proto b/aasdk_proto/DrivingStatusEnum.proto
index 5adf037..4af8e3b 100644
--- a/aasdk_proto/DrivingStatusEnum.proto
+++ b/aasdk_proto/DrivingStatusEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/EnvironmentData.proto b/aasdk_proto/EnvironmentData.proto
index b461121..7c49d70 100644
--- a/aasdk_proto/EnvironmentData.proto
+++ b/aasdk_proto/EnvironmentData.proto
@@ -16,13 +16,13 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message Environment
 {
-    int32 temperature =1;
-    int32 pressure = 2;
-    int32 rain = 3;
+    required int32 temperature =1;
+    required int32 pressure = 2;
+    required int32 rain = 3;
 }
diff --git a/aasdk_proto/FuelLevelData.proto b/aasdk_proto/FuelLevelData.proto
index f0fe967..0eb1269 100644
--- a/aasdk_proto/FuelLevelData.proto
+++ b/aasdk_proto/FuelLevelData.proto
@@ -16,13 +16,13 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message FuelLevel
 {
-    int32 fuel_level = 1;
-    int32 range = 2;
-    bool low_fuel = 3;
+    required int32 fuel_level = 1;
+    required int32 range = 2;
+    required bool low_fuel = 3;
 }
diff --git a/aasdk_proto/GPSLocationData.proto b/aasdk_proto/GPSLocationData.proto
index 1960714..d1756d6 100644
--- a/aasdk_proto/GPSLocationData.proto
+++ b/aasdk_proto/GPSLocationData.proto
@@ -16,17 +16,17 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message GPSLocation
 {
-    uint64 timestamp = 1;
-    int32 latitude = 2;
-    int32 longitude = 3;
-    uint32 accuracy = 4;
-    int32 altitude = 5;
-    int32 speed = 6;
-    int32 bearing = 7;
+    required uint64 timestamp = 1;
+    required int32 latitude = 2;
+    required int32 longitude = 3;
+    required uint32 accuracy = 4;
+    optional int32 altitude = 5;
+    optional int32 speed = 6;
+    optional int32 bearing = 7;
 }
diff --git a/aasdk_proto/GearData.proto b/aasdk_proto/GearData.proto
index 4eb4ca9..a98463c 100644
--- a/aasdk_proto/GearData.proto
+++ b/aasdk_proto/GearData.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "GearEnum.proto";
 
@@ -24,5 +24,5 @@ package f1x.aasdk.proto.data;
 
 message Gear
 {
-    enums.Gear.Enum gear = 1;
+    required enums.Gear.Enum gear = 1;
 }
diff --git a/aasdk_proto/GearEnum.proto b/aasdk_proto/GearEnum.proto
index 3f723b6..6e61149 100644
--- a/aasdk_proto/GearEnum.proto
+++ b/aasdk_proto/GearEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/GyroData.proto b/aasdk_proto/GyroData.proto
index ec3835c..eb82122 100644
--- a/aasdk_proto/GyroData.proto
+++ b/aasdk_proto/GyroData.proto
@@ -16,13 +16,13 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message Gyro
 {
-    int32 rotation_speed_x = 1;
-    int32 rotation_speed_y = 2;
-    int32 rotation_speed_z = 3;
+    required int32 rotation_speed_x = 1;
+    required int32 rotation_speed_y = 2;
+    required int32 rotation_speed_z = 3;
 }
diff --git a/aasdk_proto/HVACData.proto b/aasdk_proto/HVACData.proto
index 6850a7c..d8f7384 100644
--- a/aasdk_proto/HVACData.proto
+++ b/aasdk_proto/HVACData.proto
@@ -16,12 +16,12 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message HVAC
 {
-    int32 target_temperature = 1;
-    int32 current_temperature = 2;
+    required int32 target_temperature = 1;
+    required int32 current_temperature = 2;
 }
diff --git a/aasdk_proto/HeadlightStatusEnum.proto b/aasdk_proto/HeadlightStatusEnum.proto
index f930da3..7130293 100644
--- a/aasdk_proto/HeadlightStatusEnum.proto
+++ b/aasdk_proto/HeadlightStatusEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/IndicatorStatusEnum.proto b/aasdk_proto/IndicatorStatusEnum.proto
index ab3e98d..14eb37e 100644
--- a/aasdk_proto/IndicatorStatusEnum.proto
+++ b/aasdk_proto/IndicatorStatusEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/InputChannelData.proto b/aasdk_proto/InputChannelData.proto
index c1b3e59..e5888a5 100644
--- a/aasdk_proto/InputChannelData.proto
+++ b/aasdk_proto/InputChannelData.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "TouchConfigData.proto";
 
@@ -25,6 +25,6 @@ package f1x.aasdk.proto.data;
 message InputChannel
 {
     repeated uint32 supported_keycodes = 1;
-    TouchConfig touch_screen_config = 2;
-    TouchConfig touch_pad_config = 3;
+    optional TouchConfig touch_screen_config = 2;
+    optional TouchConfig touch_pad_config = 3;
 }
diff --git a/aasdk_proto/InputChannelMessageIdsEnum.proto b/aasdk_proto/InputChannelMessageIdsEnum.proto
index d4e3a1e..c507f15 100644
--- a/aasdk_proto/InputChannelMessageIdsEnum.proto
+++ b/aasdk_proto/InputChannelMessageIdsEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.ids;
 
diff --git a/aasdk_proto/InputEventIndicationMessage.proto b/aasdk_proto/InputEventIndicationMessage.proto
index 2cf8cdc..5bdbab0 100644
--- a/aasdk_proto/InputEventIndicationMessage.proto
+++ b/aasdk_proto/InputEventIndicationMessage.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "TouchEventData.proto";
 import "ButtonEventsData.proto";
@@ -27,10 +27,10 @@ package f1x.aasdk.proto.messages;
 
 message InputEventIndication
 {
-    uint64 timestamp = 1;
-    int32 disp_channel = 2;
-    data.TouchEvent touch_event = 3;
-    data.ButtonEvents button_event = 4;
-    data.AbsoluteInputEvents absolute_input_event = 5;
-    data.RelativeInputEvents relative_input_event = 6;
+    required uint64 timestamp = 1;
+    optional int32 disp_channel = 2;
+    optional data.TouchEvent touch_event = 3;
+    optional data.ButtonEvents button_event = 4;
+    optional data.AbsoluteInputEvents absolute_input_event = 5;
+    optional data.RelativeInputEvents relative_input_event = 6;
 }
diff --git a/aasdk_proto/LightData.proto b/aasdk_proto/LightData.proto
index 61d75ed..def2e01 100644
--- a/aasdk_proto/LightData.proto
+++ b/aasdk_proto/LightData.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "HeadlightStatusEnum.proto";
 import "IndicatorStatusEnum.proto";
@@ -25,7 +25,7 @@ package f1x.aasdk.proto.data;
 
 message Light
 {
-    enums.HeadlightStatus.Enum headlight = 1;
-    enums.IndicatorStatus.Enum indicator = 2;
-    bool hazard_light_on = 3;
+    required enums.HeadlightStatus.Enum headlight = 1;
+    required enums.IndicatorStatus.Enum indicator = 2;
+    required bool hazard_light_on = 3;
 }
diff --git a/aasdk_proto/MediaChannelData.proto b/aasdk_proto/MediaChannelData.proto
new file mode 100644
index 0000000..a2b21b3
--- /dev/null
+++ b/aasdk_proto/MediaChannelData.proto
@@ -0,0 +1,26 @@
+/*
+*  This file is part of aasdk library project.
+*  Copyright (C) 2018 f1x.studio (Michal Szwaj)
+*
+*  aasdk is free software: you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation; either version 3 of the License, or
+*  (at your option) any later version.
+
+*  aasdk is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+syntax="proto2";
+
+package f1x.aasdk.proto.data;
+
+message MediaInfoChannel
+{
+   
+}
diff --git a/aasdk_proto/NavigationChannelData.proto b/aasdk_proto/NavigationChannelData.proto
index 69a08da..fb59f7d 100644
--- a/aasdk_proto/NavigationChannelData.proto
+++ b/aasdk_proto/NavigationChannelData.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "NavigationImageOptionsData.proto";
 
@@ -24,7 +24,7 @@ package f1x.aasdk.proto.data;
 
 message NavigationChannel
 {
-    uint32 minimum_interval_ms = 1;
-    uint32 type = 2;
-    NavigationImageOptions image_options = 3;
+    required uint32 minimum_interval_ms = 1;
+    required uint32 type = 2;
+    required NavigationImageOptions image_options = 3;
 }
diff --git a/aasdk_proto/NavigationFocusRequestMessage.proto b/aasdk_proto/NavigationFocusRequestMessage.proto
index 6be2e12..f875af0 100644
--- a/aasdk_proto/NavigationFocusRequestMessage.proto
+++ b/aasdk_proto/NavigationFocusRequestMessage.proto
@@ -16,11 +16,11 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.messages;
 
 message NavigationFocusRequest
 {
-    uint32 type = 1;
+    required uint32 type = 1;
 }
diff --git a/aasdk_proto/NavigationFocusResponseMessage.proto b/aasdk_proto/NavigationFocusResponseMessage.proto
index 3a81039..9a36eda 100644
--- a/aasdk_proto/NavigationFocusResponseMessage.proto
+++ b/aasdk_proto/NavigationFocusResponseMessage.proto
@@ -16,11 +16,11 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.messages;
 
 message NavigationFocusResponse
 {
-    uint32 type = 1;
+    required uint32 type = 1;
 }
diff --git a/aasdk_proto/NavigationImageOptionsData.proto b/aasdk_proto/NavigationImageOptionsData.proto
index 0ba4bbf..eb902a6 100644
--- a/aasdk_proto/NavigationImageOptionsData.proto
+++ b/aasdk_proto/NavigationImageOptionsData.proto
@@ -16,13 +16,13 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message NavigationImageOptions
 {
-    int32 width = 1;
-    int32 height = 2;
-    int32 colour_depth_bits = 3;
+    required int32 width = 1;
+    required int32 height = 2;
+    required int32 colour_depth_bits = 3;
 }
diff --git a/aasdk_proto/OdometerData.proto b/aasdk_proto/OdometerData.proto
index 9fd13ff..286666d 100644
--- a/aasdk_proto/OdometerData.proto
+++ b/aasdk_proto/OdometerData.proto
@@ -16,12 +16,12 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message Odometer
 {
-    int32 total_mileage = 1;
-    int32 trip_mileage = 2;
+    required int32 total_mileage = 1;
+    required int32 trip_mileage = 2;
 }
diff --git a/aasdk_proto/ParkingBrakeData.proto b/aasdk_proto/ParkingBrakeData.proto
index a3dfcb1..f02f7ab 100644
--- a/aasdk_proto/ParkingBrakeData.proto
+++ b/aasdk_proto/ParkingBrakeData.proto
@@ -16,11 +16,11 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message ParkingBrake
 {
-    bool parking_brake = 1;
+    required bool parking_brake = 1;
 }
diff --git a/aasdk_proto/PassengerData.proto b/aasdk_proto/PassengerData.proto
index a028c1f..e53232b 100644
--- a/aasdk_proto/PassengerData.proto
+++ b/aasdk_proto/PassengerData.proto
@@ -16,11 +16,11 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message Passenger
 {
-    bool passenger_present = 1;
+    required bool passenger_present = 1;
 }
diff --git a/aasdk_proto/PingRequestMessage.proto b/aasdk_proto/PingRequestMessage.proto
index d186fb6..5a9a017 100644
--- a/aasdk_proto/PingRequestMessage.proto
+++ b/aasdk_proto/PingRequestMessage.proto
@@ -16,11 +16,11 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.messages;
 
 message PingRequest
 {
-    int64 timestamp = 1;
+    required int64 timestamp = 1;
 }
diff --git a/aasdk_proto/PingResponseMessage.proto b/aasdk_proto/PingResponseMessage.proto
index ebb9229..c511c42 100644
--- a/aasdk_proto/PingResponseMessage.proto
+++ b/aasdk_proto/PingResponseMessage.proto
@@ -16,11 +16,11 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.messages;
 
 message PingResponse
 {
-    int64 timestamp = 1;
+    required int64 timestamp = 1;
 }
diff --git a/aasdk_proto/RPMData.proto b/aasdk_proto/RPMData.proto
index 3aacc40..c866180 100644
--- a/aasdk_proto/RPMData.proto
+++ b/aasdk_proto/RPMData.proto
@@ -16,11 +16,11 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message RPM
 {
-    int32 rpm = 1;
+    required int32 rpm = 1;
 }
diff --git a/aasdk_proto/RelativeInputEventData.proto b/aasdk_proto/RelativeInputEventData.proto
index c8efcd9..92587b8 100644
--- a/aasdk_proto/RelativeInputEventData.proto
+++ b/aasdk_proto/RelativeInputEventData.proto
@@ -16,12 +16,12 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message RelativeInputEvent
 {
-    uint32 scan_code = 1;
-    int32 delta = 2;
+    required uint32 scan_code = 1;
+    required int32 delta = 2;
 }
diff --git a/aasdk_proto/RelativeInputEventsData.proto b/aasdk_proto/RelativeInputEventsData.proto
index b70fe5c..298babb 100644
--- a/aasdk_proto/RelativeInputEventsData.proto
+++ b/aasdk_proto/RelativeInputEventsData.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "RelativeInputEventData.proto";
 
diff --git a/aasdk_proto/SensorChannelData.proto b/aasdk_proto/SensorChannelData.proto
index 976d0dc..837738d 100644
--- a/aasdk_proto/SensorChannelData.proto
+++ b/aasdk_proto/SensorChannelData.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "SensorData.proto";
 
diff --git a/aasdk_proto/SensorChannelMessageIdsEnum.proto b/aasdk_proto/SensorChannelMessageIdsEnum.proto
index f85d46e..e68d10a 100644
--- a/aasdk_proto/SensorChannelMessageIdsEnum.proto
+++ b/aasdk_proto/SensorChannelMessageIdsEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.ids;
 
diff --git a/aasdk_proto/SensorData.proto b/aasdk_proto/SensorData.proto
index b21e485..f6ac56a 100644
--- a/aasdk_proto/SensorData.proto
+++ b/aasdk_proto/SensorData.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "SensorTypeEnum.proto";
 
@@ -24,5 +24,5 @@ package f1x.aasdk.proto.data;
 
 message Sensor
 {
-    enums.SensorType.Enum type = 1;
+    required enums.SensorType.Enum type = 1;
 }
diff --git a/aasdk_proto/SensorEventIndicationMessage.proto b/aasdk_proto/SensorEventIndicationMessage.proto
index 0b2cce8..00d4648 100644
--- a/aasdk_proto/SensorEventIndicationMessage.proto
+++ b/aasdk_proto/SensorEventIndicationMessage.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "GPSLocationData.proto";
 import "CompassData.proto";
diff --git a/aasdk_proto/SensorStartRequestMessage.proto b/aasdk_proto/SensorStartRequestMessage.proto
index f9abda1..d4397ce 100644
--- a/aasdk_proto/SensorStartRequestMessage.proto
+++ b/aasdk_proto/SensorStartRequestMessage.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "SensorTypeEnum.proto";
 
@@ -24,6 +24,6 @@ package f1x.aasdk.proto.messages;
 
 message SensorStartRequestMessage
 {
-    enums.SensorType.Enum sensor_type = 1;
-    int64 refresh_interval = 2;
+    required enums.SensorType.Enum sensor_type = 1;
+    required int64 refresh_interval = 2;
 }
diff --git a/aasdk_proto/SensorTypeEnum.proto b/aasdk_proto/SensorTypeEnum.proto
index 9001bdf..85a5e6e 100644
--- a/aasdk_proto/SensorTypeEnum.proto
+++ b/aasdk_proto/SensorTypeEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/ServiceDiscoveryRequestMessage.proto b/aasdk_proto/ServiceDiscoveryRequestMessage.proto
index ee1e313..05e61b9 100644
--- a/aasdk_proto/ServiceDiscoveryRequestMessage.proto
+++ b/aasdk_proto/ServiceDiscoveryRequestMessage.proto
@@ -16,12 +16,12 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.messages;
 
 message ServiceDiscoveryRequest
 {
-    string device_name = 4;
-    string device_brand = 5;
+    required string device_name = 4;
+    required string device_brand = 5;
 }
diff --git a/aasdk_proto/ServiceDiscoveryResponseMessage.proto b/aasdk_proto/ServiceDiscoveryResponseMessage.proto
index ea11d3f..59e6944 100644
--- a/aasdk_proto/ServiceDiscoveryResponseMessage.proto
+++ b/aasdk_proto/ServiceDiscoveryResponseMessage.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "ChannelDescriptorData.proto";
 
@@ -25,15 +25,15 @@ package f1x.aasdk.proto.messages;
 message ServiceDiscoveryResponse
 {
     repeated data.ChannelDescriptor channels = 1;
-    string head_unit_name = 2;
-    string car_model = 3;
-    string car_year = 4;
-    string car_serial = 5;
-    bool left_hand_drive_vehicle = 6;
-    string headunit_manufacturer = 7;
-    string headunit_model = 8;
-    string sw_build = 9;
-    string sw_version = 10;
-    bool can_play_native_media_during_vr = 11;
-    bool hide_clock = 12;
+    required string head_unit_name = 2;
+    required string car_model = 3;
+    required string car_year = 4;
+    required string car_serial = 5;
+    required bool left_hand_drive_vehicle = 6;
+    required string headunit_manufacturer = 7;
+    required string headunit_model = 8;
+    required string sw_build = 9;
+    required string sw_version = 10;
+    required bool can_play_native_media_during_vr = 11;
+    optional bool hide_clock = 12;
 }
diff --git a/aasdk_proto/ShutdownReasonEnum.proto b/aasdk_proto/ShutdownReasonEnum.proto
index 451174b..b7124fd 100644
--- a/aasdk_proto/ShutdownReasonEnum.proto
+++ b/aasdk_proto/ShutdownReasonEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/ShutdownRequestMessage.proto b/aasdk_proto/ShutdownRequestMessage.proto
index ba7696f..b6ee0cc 100644
--- a/aasdk_proto/ShutdownRequestMessage.proto
+++ b/aasdk_proto/ShutdownRequestMessage.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "ShutdownReasonEnum.proto";
 
@@ -24,5 +24,5 @@ package f1x.aasdk.proto.messages;
 
 message ShutdownRequest
 {
-    enums.ShutdownReason.Enum reason = 1;
+    required enums.ShutdownReason.Enum reason = 1;
 }
diff --git a/aasdk_proto/ShutdownResponseMessage.proto b/aasdk_proto/ShutdownResponseMessage.proto
index 66c7325..1527586 100644
--- a/aasdk_proto/ShutdownResponseMessage.proto
+++ b/aasdk_proto/ShutdownResponseMessage.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.messages;
 
diff --git a/aasdk_proto/SpeedData.proto b/aasdk_proto/SpeedData.proto
index 304a01b..007ee05 100644
--- a/aasdk_proto/SpeedData.proto
+++ b/aasdk_proto/SpeedData.proto
@@ -16,13 +16,13 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message Speed
 {
-    int32 speed = 1;
-    bool cruise_engaged = 2;
-    bool cruise_set_speed = 3;
+    required int32 speed = 1;
+    optional bool cruise_engaged = 2;
+    optional bool cruise_set_speed = 3;
 }
diff --git a/aasdk_proto/StatusEnum.proto b/aasdk_proto/StatusEnum.proto
index 9bf67ab..a19271a 100644
--- a/aasdk_proto/StatusEnum.proto
+++ b/aasdk_proto/StatusEnum.proto
@@ -1,3 +1,4 @@
+
 /*
 *  This file is part of aasdk library project.
 *  Copyright (C) 2018 f1x.studio (Michal Szwaj)
@@ -16,7 +17,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/SteeringWheelData.proto b/aasdk_proto/SteeringWheelData.proto
index 0bfacc8..f5572f3 100644
--- a/aasdk_proto/SteeringWheelData.proto
+++ b/aasdk_proto/SteeringWheelData.proto
@@ -16,12 +16,12 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message SteeringWheel
 {
-    int32 steering_angle = 1;
-    int32 wheel_speed = 2;
+    required int32 steering_angle = 1;
+    required int32 wheel_speed = 2;
 }
diff --git a/aasdk_proto/TouchActionEnum.proto b/aasdk_proto/TouchActionEnum.proto
index 9a86f7f..7d889e1 100644
--- a/aasdk_proto/TouchActionEnum.proto
+++ b/aasdk_proto/TouchActionEnum.proto
@@ -1,31 +1,33 @@
 /*
-*  This file is part of aasdk library project.
-*  Copyright (C) 2018 f1x.studio (Michal Szwaj)
-*
-*  aasdk is free software: you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 3 of the License, or
-*  (at your option) any later version.
-
-*  aasdk is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-syntax="proto3";
-
-package f1x.aasdk.proto.enums;
-
-message TouchAction
-{
-    enum Enum
-    {
-        PRESS = 0;
-        RELEASE = 1;
-        DRAG = 2;
-    }
-}
+*  This file is part of aasdk library project.
+*  Copyright (C) 2018 f1x.studio (Michal Szwaj)
+*
+*  aasdk is free software: you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation; either version 3 of the License, or
+*  (at your option) any later version.
+
+*  aasdk is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+syntax="proto2";
+
+package f1x.aasdk.proto.enums;
+
+message TouchAction
+{
+    enum Enum
+    {
+        PRESS = 0;
+        RELEASE = 1;
+        DRAG = 2;
+        POINTER_DOWN = 5;
+        POINTER_UP = 6;
+    }
+}
diff --git a/aasdk_proto/TouchConfigData.proto b/aasdk_proto/TouchConfigData.proto
index 988f52e..d001941 100644
--- a/aasdk_proto/TouchConfigData.proto
+++ b/aasdk_proto/TouchConfigData.proto
@@ -16,12 +16,12 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message TouchConfig
 {
-    uint32 width = 1;
-    uint32 height = 2;
+    required uint32 width = 1;
+    required uint32 height = 2;
 }
diff --git a/aasdk_proto/TouchEventData.proto b/aasdk_proto/TouchEventData.proto
index dc3bfcd..bfab6ba 100644
--- a/aasdk_proto/TouchEventData.proto
+++ b/aasdk_proto/TouchEventData.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "TouchLocationData.proto";
 import "TouchActionEnum.proto";
@@ -26,6 +26,6 @@ package f1x.aasdk.proto.data;
 message TouchEvent
 {
     repeated data.TouchLocation touch_location = 1;
-    uint32 action_index = 2;
-    enums.TouchAction.Enum touch_action = 3;
+    optional uint32 action_index = 2;
+    required enums.TouchAction.Enum touch_action = 3;
 }
diff --git a/aasdk_proto/TouchLocationData.proto b/aasdk_proto/TouchLocationData.proto
index 101ca39..c7c4c39 100644
--- a/aasdk_proto/TouchLocationData.proto
+++ b/aasdk_proto/TouchLocationData.proto
@@ -16,13 +16,13 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message TouchLocation
 {
-	uint32 x = 1;
-	uint32 y = 2;
-	uint32 pointer_id = 3;
+	required uint32 x = 1;
+	required uint32 y = 2;
+	required uint32 pointer_id = 3;
 }
diff --git a/aasdk_proto/VendorExtensionChannelData.proto b/aasdk_proto/VendorExtensionChannelData.proto
index 82a8485..db46482 100644
--- a/aasdk_proto/VendorExtensionChannelData.proto
+++ b/aasdk_proto/VendorExtensionChannelData.proto
@@ -16,13 +16,13 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.data;
 
 message VendorExtensionChannel
 {
-    string name = 1;
+    required string name = 1;
     repeated string package_white_list = 2;
-    bytes data = 3;
+    optional bytes data = 3;
 }
diff --git a/aasdk_proto/VersionResponseStatusEnum.proto b/aasdk_proto/VersionResponseStatusEnum.proto
index efec2fa..5ee8a43 100644
--- a/aasdk_proto/VersionResponseStatusEnum.proto
+++ b/aasdk_proto/VersionResponseStatusEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/VideoConfigData.proto b/aasdk_proto/VideoConfigData.proto
index 98fc3fb..ceb2bf2 100644
--- a/aasdk_proto/VideoConfigData.proto
+++ b/aasdk_proto/VideoConfigData.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "VideoResolutionEnum.proto";
 import "VideoFPSEnum.proto";
@@ -25,10 +25,10 @@ package f1x.aasdk.proto.data;
 
 message VideoConfig
 {
-    enums.VideoResolution.Enum video_resolution = 1;
-    enums.VideoFPS.Enum video_fps = 2;
-    uint32 margin_width = 3;
-    uint32 margin_height = 4;
-    uint32 dpi = 5;
-    uint32 additional_depth = 6;
+    required enums.VideoResolution.Enum video_resolution = 1;
+    required enums.VideoFPS.Enum video_fps = 2;
+    required uint32 margin_width = 3;
+    required uint32 margin_height = 4;
+    required uint32 dpi = 5;
+    optional uint32 additional_depth = 6;
 }
diff --git a/aasdk_proto/VideoFPSEnum.proto b/aasdk_proto/VideoFPSEnum.proto
index 734bdf6..44b0d1d 100644
--- a/aasdk_proto/VideoFPSEnum.proto
+++ b/aasdk_proto/VideoFPSEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/VideoFocusIndicationMessage.proto b/aasdk_proto/VideoFocusIndicationMessage.proto
index 91a8ee4..d6f6c29 100644
--- a/aasdk_proto/VideoFocusIndicationMessage.proto
+++ b/aasdk_proto/VideoFocusIndicationMessage.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "VideoFocusModeEnum.proto";
 
@@ -24,6 +24,6 @@ package f1x.aasdk.proto.messages;
 
 message VideoFocusIndication
 {
-    enums.VideoFocusMode.Enum focus_mode = 1;
-    bool unrequested = 2;
+    required enums.VideoFocusMode.Enum focus_mode = 1;
+    required bool unrequested = 2;
 }
diff --git a/aasdk_proto/VideoFocusModeEnum.proto b/aasdk_proto/VideoFocusModeEnum.proto
index e0f930a..15c3682 100644
--- a/aasdk_proto/VideoFocusModeEnum.proto
+++ b/aasdk_proto/VideoFocusModeEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/VideoFocusReasonEnum.proto b/aasdk_proto/VideoFocusReasonEnum.proto
index 0d20ae5..1352729 100644
--- a/aasdk_proto/VideoFocusReasonEnum.proto
+++ b/aasdk_proto/VideoFocusReasonEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/VideoFocusRequestMessage.proto b/aasdk_proto/VideoFocusRequestMessage.proto
index 37c3b8b..a1c6b1e 100644
--- a/aasdk_proto/VideoFocusRequestMessage.proto
+++ b/aasdk_proto/VideoFocusRequestMessage.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 import "VideoFocusModeEnum.proto";
 import "VideoFocusReasonEnum.proto";
@@ -25,7 +25,7 @@ package f1x.aasdk.proto.messages;
 
 message VideoFocusRequest
 {
-    int32 disp_index = 1;
-    enums.VideoFocusMode.Enum focus_mode = 2;
-    enums.VideoFocusReason.Enum focus_reason = 3;
+    optional int32 disp_index = 1;
+    required enums.VideoFocusMode.Enum focus_mode = 2;
+    required enums.VideoFocusReason.Enum focus_reason = 3;
 }
diff --git a/aasdk_proto/VideoResolutionEnum.proto b/aasdk_proto/VideoResolutionEnum.proto
index 6e7b9d0..fde8f26 100644
--- a/aasdk_proto/VideoResolutionEnum.proto
+++ b/aasdk_proto/VideoResolutionEnum.proto
@@ -16,7 +16,7 @@
 *  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
 */
 
-syntax="proto3";
+syntax="proto2";
 
 package f1x.aasdk.proto.enums;
 
diff --git a/aasdk_proto/WifiChannelData.proto b/aasdk_proto/WifiChannelData.proto
new file mode 100644
index 0000000..b55b730
--- /dev/null
+++ b/aasdk_proto/WifiChannelData.proto
@@ -0,0 +1,30 @@
+/*
+*  This file is part of aasdk library project.
+*  Copyright (C) 2018 f1x.studio (Michal Szwaj)
+*
+*  aasdk is free software: you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation; either version 3 of the License, or
+*  (at your option) any later version.
+
+*  aasdk is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with aasdk. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+syntax="proto2";
+
+option optimize_for=SPEED;
+
+
+
+package f1x.aasdk.proto.data;
+
+message WifiChannel
+{
+    required string ssid = 1;
+}