Updated protobuf model
Fixed compilation errors