diff --git a/fleetspeak/build.sh b/fleetspeak/build.sh
index d3934447..0cc70313 100755
--- a/fleetspeak/build.sh
+++ b/fleetspeak/build.sh
@@ -94,17 +94,11 @@ time (
 
       chmod 755 pkg/*
 
-      chmod o-r pkg/etc/fleetspeak-server/https.config
-      chmod g-r pkg/etc/fleetspeak-server/https.config
-
       sed -i "s/<version>/$(cat ../VERSION)/" pkg/DEBIAN/control
 
       mkdir -p pkg/usr/bin
       install -o root -g root src/server/server/server pkg/usr/bin/fleetspeak-server
   
-      mkdir -p pkg/usr/lib/fleetspeak-server
-      install -o root -g root src/server/plugins/*/*.so pkg/usr/lib/fleetspeak-server
-
       dpkg-deb -b pkg out.deb
     '
   fi
diff --git a/fleetspeak/pkg-tmpl/DEBIAN/conffiles b/fleetspeak/pkg-tmpl/DEBIAN/conffiles
index 503f750b..9b580185 100644
--- a/fleetspeak/pkg-tmpl/DEBIAN/conffiles
+++ b/fleetspeak/pkg-tmpl/DEBIAN/conffiles
@@ -1,3 +1 @@
-/etc/fleetspeak-server/https.config
-/etc/fleetspeak-server/plugins.config
 /etc/fleetspeak-server/server.config
diff --git a/fleetspeak/pkg-tmpl/etc/fleetspeak-server/https.config b/fleetspeak/pkg-tmpl/etc/fleetspeak-server/https.config
deleted file mode 100644
index 904d90eb..00000000
--- a/fleetspeak/pkg-tmpl/etc/fleetspeak-server/https.config
+++ /dev/null
@@ -1,18 +0,0 @@
-# Fleetspeak https configuration file. This is a text format
-# fleetspeak.plugins.HttpsConfig protocol buffer.
-
-# The address to bind to.
-listen_address: "localhost:4321"
-
-# A PEM encoded x509 certificate chain that the server should present as its
-# identity.
-certificate: ""
-
-# A PEM encoded private key matching the start of the certificate chain in
-# certificate.
-key: ""
-
-# Whether to activate experimental streaming connection support on the server,
-# meaning that the server will include support for both legacy and streaming
-# clients.
-streaming: false
diff --git a/fleetspeak/pkg-tmpl/etc/fleetspeak-server/plugins.config b/fleetspeak/pkg-tmpl/etc/fleetspeak-server/plugins.config
deleted file mode 100644
index ecdfd685..00000000
--- a/fleetspeak/pkg-tmpl/etc/fleetspeak-server/plugins.config
+++ /dev/null
@@ -1,83 +0,0 @@
-# Fleetspeak server plugin configuration file.  This is a text format
-# fleetspeak.plugins.Config protocol buffer.
-
-####
-#### Datastore, exactly one is required:
-####
-
-# This chooses where Fleetspeak's persistent state is stored. The sqlite
-# datastore is meant for integration testing and other small, single-server
-# deployments. Most production deployments should use the mysql option.
-
-#datastore {
-#  path: "/usr/lib/fleetspeak-server/sqlite.so"
-#  factory_name: "Factory"
-#  
-#  # For the sqlite datastore, the config string is the path to the database
-#  config: "/var/lib/fleetspeak-server/database.sqlite3"
-#}
-
-#datastore {
-#  path: "/usr/lib/fleetspeak-server/mysql.so"
-#  factory_name: "Factory"
-#  
-#  # For the sqlite datastore, the config string described the database connection,
-#  # e.g.: "<user>:<pass>@tcp(<host>)/<db>".
-#  #
-#  # See https://github.com/go-sql-driver/mysql#usage for more details.
-#  config: "/var/lib/fleetspeak-server/database.sqlite3"
-#}
-
-####
-#### Communicator, at least one is required:
-####
-
-communicator {
-  path: "/usr/lib/fleetspeak-server/https.so"
-
-  # The HTTPSFactory expects clients to connect directly to this server over
-  # https. If you will be running behind a loadbalancer/reverse proxy supporting
-  # the haproxy 'Proxy' protocol you should enable this protocol in your
-  # loadbalancer and change factory_name to 'ProxyHTTPSFactory.
-  #
-  # Note that while ProxyHTTPSFactory will accept connections directly from
-  # endpoints, it effectively allows them to spoof their ip. Therefore, when
-  # using the ProxyHTTPSFactory, it is recommended to keep the server itself
-  # firewalled to be accessible only through a loadbalancer.
-  factory_name: "HTTPSFactory"
-
-  # This config string is the path of a network configuration file containing the
-  # server key and certificate.
-  config: "/etc/fleetspeak-server/https.config
-}
-
-####
-#### ServiceFactories, at least one is required.
-####
-
-# The loaded ServiceFactories determine what types of services are possible, for
-# example the GRPCServiceFactory contains the code needed to install a service
-# which passes messages to another process through a specific GRPC
-# protocol. Services are configured in the server configuration file.
-
-# GRPC
-service_factory {
-  path: "/usr/lib/fleetspeak-server/grpc.so"
-  factory_name: "GRPCServiceFactoryFactory"  
-}
-
-####
-#### Authorizer, optional.
-####
-
-# This LabelFilter is a simple authorizer which only alows in clients
-# with a specific label. It can be replaced with a more complex authorizer to
-# provide more nuanced filtering, DOS protection, etc.
-#authorizer {
-#  path: "/usr/lib/fleetspeak-server/authorizer.so"
-#  factory_name: "LabelFilter"
-#  
-# # The label filter authorizer will only allow connection from clients
-# # reporting with this label.
-#  config: "<label>"
-#}
diff --git a/fleetspeak/src/client/channel/proto/fleetspeak_channel/channel.pb.go b/fleetspeak/src/client/channel/proto/fleetspeak_channel/channel.pb.go
index 61cdd379..9ff3a360 100644
--- a/fleetspeak/src/client/channel/proto/fleetspeak_channel/channel.pb.go
+++ b/fleetspeak/src/client/channel/proto/fleetspeak_channel/channel.pb.go
@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: fleetspeak/src/client/channel/proto/fleetspeak_channel/channel.proto
 
-/*
-Package fleetspeak_channel is a generated protocol buffer package.
-
-It is generated from these files:
-	fleetspeak/src/client/channel/proto/fleetspeak_channel/channel.proto
-
-It has these top-level messages:
-	StartupData
-*/
 package fleetspeak_channel
 
 import proto "github.com/golang/protobuf/proto"
@@ -32,15 +23,37 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // find useful.
 type StartupData struct {
 	// Self-reported PID.
-	Pid int64 `protobuf:"varint,1,opt,name=pid" json:"pid,omitempty"`
+	Pid int64 `protobuf:"varint,1,opt,name=pid,proto3" json:"pid,omitempty"`
 	// Self-reported service version string.
-	Version string `protobuf:"bytes,2,opt,name=version" json:"version,omitempty"`
+	Version              string   `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StartupData) Reset()         { *m = StartupData{} }
+func (m *StartupData) String() string { return proto.CompactTextString(m) }
+func (*StartupData) ProtoMessage()    {}
+func (*StartupData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channel_a8c531f6a2ef74d4, []int{0}
+}
+func (m *StartupData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StartupData.Unmarshal(m, b)
+}
+func (m *StartupData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StartupData.Marshal(b, m, deterministic)
+}
+func (dst *StartupData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StartupData.Merge(dst, src)
+}
+func (m *StartupData) XXX_Size() int {
+	return xxx_messageInfo_StartupData.Size(m)
+}
+func (m *StartupData) XXX_DiscardUnknown() {
+	xxx_messageInfo_StartupData.DiscardUnknown(m)
 }
 
-func (m *StartupData) Reset()                    { *m = StartupData{} }
-func (m *StartupData) String() string            { return proto.CompactTextString(m) }
-func (*StartupData) ProtoMessage()               {}
-func (*StartupData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_StartupData proto.InternalMessageInfo
 
 func (m *StartupData) GetPid() int64 {
 	if m != nil {
@@ -61,10 +74,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/client/channel/proto/fleetspeak_channel/channel.proto", fileDescriptor0)
+	proto.RegisterFile("fleetspeak/src/client/channel/proto/fleetspeak_channel/channel.proto", fileDescriptor_channel_a8c531f6a2ef74d4)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_channel_a8c531f6a2ef74d4 = []byte{
 	// 134 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x49, 0xcb, 0x49, 0x4d,
 	0x2d, 0x29, 0x2e, 0x48, 0x4d, 0xcc, 0xd6, 0x2f, 0x2e, 0x4a, 0xd6, 0x4f, 0xce, 0xc9, 0x4c, 0xcd,
diff --git a/fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/config.pb.go b/fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/config.pb.go
index cca5921f..eafd5c74 100644
--- a/fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/config.pb.go
+++ b/fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/config.pb.go
@@ -1,23 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/config.proto
 
-/*
-Package fleetspeak_daemonservice is a generated protocol buffer package.
-
-It is generated from these files:
-	fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/config.proto
-	fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/messages.proto
-
-It has these top-level messages:
-	Config
-	StdOutputData
-*/
 package fleetspeak_daemonservice
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/duration"
+import duration "github.com/golang/protobuf/ptypes/duration"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -33,40 +22,62 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // The configuration information expected by daemonservice.Factory in
 // ClientServiceConfig.config.
 type Config struct {
-	Argv []string `protobuf:"bytes,1,rep,name=argv" json:"argv,omitempty"`
+	Argv []string `protobuf:"bytes,1,rep,name=argv,proto3" json:"argv,omitempty"`
 	// If set, process will be killed after this much inactivity. Any message to
 	// or from the process, and any stdin/stderr output counts as inactivity.
-	InactivityTimeout *google_protobuf.Duration `protobuf:"bytes,2,opt,name=inactivity_timeout,json=inactivityTimeout" json:"inactivity_timeout,omitempty"`
+	InactivityTimeout *duration.Duration `protobuf:"bytes,2,opt,name=inactivity_timeout,json=inactivityTimeout,proto3" json:"inactivity_timeout,omitempty"`
 	// If set, start the process only when there is a message for it to work on.
 	// Forced to true when inactivity timeout is set.
-	LazyStart bool `protobuf:"varint,3,opt,name=lazy_start,json=lazyStart" json:"lazy_start,omitempty"`
+	LazyStart bool `protobuf:"varint,3,opt,name=lazy_start,json=lazyStart,proto3" json:"lazy_start,omitempty"`
 	// By default, daemon services report resource usage every 10 minutes. This
 	// flag disables this if set.
-	DisableResourceMonitoring bool `protobuf:"varint,4,opt,name=disable_resource_monitoring,json=disableResourceMonitoring" json:"disable_resource_monitoring,omitempty"`
+	DisableResourceMonitoring bool `protobuf:"varint,4,opt,name=disable_resource_monitoring,json=disableResourceMonitoring,proto3" json:"disable_resource_monitoring,omitempty"`
 	// How many samples to aggregate into a report when monitoring resource usage.
 	// If unset, defaults to 20.
-	ResourceMonitoringSampleSize int32 `protobuf:"varint,5,opt,name=resource_monitoring_sample_size,json=resourceMonitoringSampleSize" json:"resource_monitoring_sample_size,omitempty"`
+	ResourceMonitoringSampleSize int32 `protobuf:"varint,5,opt,name=resource_monitoring_sample_size,json=resourceMonitoringSampleSize,proto3" json:"resource_monitoring_sample_size,omitempty"`
 	// How long to wait between resource monitoring samples. If unset, defaults to
 	// 30.
-	ResourceMonitoringSamplePeriodSeconds int32 `protobuf:"varint,6,opt,name=resource_monitoring_sample_period_seconds,json=resourceMonitoringSamplePeriodSeconds" json:"resource_monitoring_sample_period_seconds,omitempty"`
+	ResourceMonitoringSamplePeriodSeconds int32 `protobuf:"varint,6,opt,name=resource_monitoring_sample_period_seconds,json=resourceMonitoringSamplePeriodSeconds,proto3" json:"resource_monitoring_sample_period_seconds,omitempty"`
 	// If set, Fleetspeak will kill and restart the child if it exceeds this
 	// memory limit, in bytes.
-	MemoryLimit int64 `protobuf:"varint,7,opt,name=memory_limit,json=memoryLimit" json:"memory_limit,omitempty"`
+	MemoryLimit int64 `protobuf:"varint,7,opt,name=memory_limit,json=memoryLimit,proto3" json:"memory_limit,omitempty"`
 	// If set, Fleetspeak will monitor child's heartbeat messages and kill
 	// unresponsive processes. The values below should be set to configure the
 	// heartbeat monitoring.
-	MonitorHeartbeats bool `protobuf:"varint,8,opt,name=monitor_heartbeats,json=monitorHeartbeats" json:"monitor_heartbeats,omitempty"`
+	MonitorHeartbeats bool `protobuf:"varint,8,opt,name=monitor_heartbeats,json=monitorHeartbeats,proto3" json:"monitor_heartbeats,omitempty"`
 	// How long to wait for initial heartbeat.
-	HeartbeatUnresponsiveGracePeriodSeconds int32 `protobuf:"varint,9,opt,name=heartbeat_unresponsive_grace_period_seconds,json=heartbeatUnresponsiveGracePeriodSeconds" json:"heartbeat_unresponsive_grace_period_seconds,omitempty"`
+	HeartbeatUnresponsiveGracePeriodSeconds int32 `protobuf:"varint,9,opt,name=heartbeat_unresponsive_grace_period_seconds,json=heartbeatUnresponsiveGracePeriodSeconds,proto3" json:"heartbeat_unresponsive_grace_period_seconds,omitempty"`
 	// How long to wait for subsequent heartbeats.
-	HeartbeatUnresponsiveKillPeriodSeconds int32             `protobuf:"varint,10,opt,name=heartbeat_unresponsive_kill_period_seconds,json=heartbeatUnresponsiveKillPeriodSeconds" json:"heartbeat_unresponsive_kill_period_seconds,omitempty"`
-	StdParams                              *Config_StdParams `protobuf:"bytes,11,opt,name=std_params,json=stdParams" json:"std_params,omitempty"`
+	HeartbeatUnresponsiveKillPeriodSeconds int32             `protobuf:"varint,10,opt,name=heartbeat_unresponsive_kill_period_seconds,json=heartbeatUnresponsiveKillPeriodSeconds,proto3" json:"heartbeat_unresponsive_kill_period_seconds,omitempty"`
+	StdParams                              *Config_StdParams `protobuf:"bytes,11,opt,name=std_params,json=stdParams,proto3" json:"std_params,omitempty"`
+	XXX_NoUnkeyedLiteral                   struct{}          `json:"-"`
+	XXX_unrecognized                       []byte            `json:"-"`
+	XXX_sizecache                          int32             `json:"-"`
+}
+
+func (m *Config) Reset()         { *m = Config{} }
+func (m *Config) String() string { return proto.CompactTextString(m) }
+func (*Config) ProtoMessage()    {}
+func (*Config) Descriptor() ([]byte, []int) {
+	return fileDescriptor_config_f5cbe9dfc7db35ca, []int{0}
+}
+func (m *Config) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Config.Unmarshal(m, b)
+}
+func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
+}
+func (dst *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(dst, src)
+}
+func (m *Config) XXX_Size() int {
+	return xxx_messageInfo_Config.Size(m)
+}
+func (m *Config) XXX_DiscardUnknown() {
+	xxx_messageInfo_Config.DiscardUnknown(m)
 }
 
-func (m *Config) Reset()                    { *m = Config{} }
-func (m *Config) String() string            { return proto.CompactTextString(m) }
-func (*Config) ProtoMessage()               {}
-func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Config proto.InternalMessageInfo
 
 func (m *Config) GetArgv() []string {
 	if m != nil {
@@ -75,7 +86,7 @@ func (m *Config) GetArgv() []string {
 	return nil
 }
 
-func (m *Config) GetInactivityTimeout() *google_protobuf.Duration {
+func (m *Config) GetInactivityTimeout() *duration.Duration {
 	if m != nil {
 		return m.InactivityTimeout
 	}
@@ -150,17 +161,39 @@ func (m *Config) GetStdParams() *Config_StdParams {
 // message_type="StdOutput"
 // data=<fleetspeak.daemonservice.StdOutputData>
 type Config_StdParams struct {
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// A message will be sent when we have flush_bytes queued, or when we
 	// have bytes flush_time_seconds old.
-	FlushBytes       int32 `protobuf:"varint,2,opt,name=flush_bytes,json=flushBytes" json:"flush_bytes,omitempty"`
-	FlushTimeSeconds int32 `protobuf:"varint,3,opt,name=flush_time_seconds,json=flushTimeSeconds" json:"flush_time_seconds,omitempty"`
+	FlushBytes           int32    `protobuf:"varint,2,opt,name=flush_bytes,json=flushBytes,proto3" json:"flush_bytes,omitempty"`
+	FlushTimeSeconds     int32    `protobuf:"varint,3,opt,name=flush_time_seconds,json=flushTimeSeconds,proto3" json:"flush_time_seconds,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Config_StdParams) Reset()         { *m = Config_StdParams{} }
+func (m *Config_StdParams) String() string { return proto.CompactTextString(m) }
+func (*Config_StdParams) ProtoMessage()    {}
+func (*Config_StdParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_config_f5cbe9dfc7db35ca, []int{0, 0}
+}
+func (m *Config_StdParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Config_StdParams.Unmarshal(m, b)
+}
+func (m *Config_StdParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Config_StdParams.Marshal(b, m, deterministic)
+}
+func (dst *Config_StdParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config_StdParams.Merge(dst, src)
+}
+func (m *Config_StdParams) XXX_Size() int {
+	return xxx_messageInfo_Config_StdParams.Size(m)
+}
+func (m *Config_StdParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_Config_StdParams.DiscardUnknown(m)
 }
 
-func (m *Config_StdParams) Reset()                    { *m = Config_StdParams{} }
-func (m *Config_StdParams) String() string            { return proto.CompactTextString(m) }
-func (*Config_StdParams) ProtoMessage()               {}
-func (*Config_StdParams) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+var xxx_messageInfo_Config_StdParams proto.InternalMessageInfo
 
 func (m *Config_StdParams) GetServiceName() string {
 	if m != nil {
@@ -189,10 +222,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/config.proto", fileDescriptor0)
+	proto.RegisterFile("fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/config.proto", fileDescriptor_config_f5cbe9dfc7db35ca)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_config_f5cbe9dfc7db35ca = []byte{
 	// 501 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x5d, 0x6f, 0xd3, 0x30,
 	0x14, 0x86, 0x15, 0xba, 0x95, 0xe5, 0x94, 0x0b, 0xe6, 0x2b, 0x6f, 0x7c, 0x2c, 0x20, 0x01, 0x61,
diff --git a/fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/messages.pb.go b/fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/messages.pb.go
index 67de2ad2..155bc0ff 100644
--- a/fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/messages.pb.go
+++ b/fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/messages.pb.go
@@ -12,23 +12,51 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
 // A fleetspeak.Message with message type "StdOutput" and data type
 // StdOutputData is sent by a daemon service to the server when the daemon
 // subprocess produces output on stdout or stderr.
 type StdOutputData struct {
 	// The pid of the daemon process.
-	Pid int64 `protobuf:"varint,1,opt,name=pid" json:"pid,omitempty"`
+	Pid int64 `protobuf:"varint,1,opt,name=pid,proto3" json:"pid,omitempty"`
 	// The index of this message within the set of messages returned for
 	// this pid.
-	MessageIndex int64  `protobuf:"varint,2,opt,name=message_index,json=messageIndex" json:"message_index,omitempty"`
-	Stdout       []byte `protobuf:"bytes,3,opt,name=stdout,proto3" json:"stdout,omitempty"`
-	Stderr       []byte `protobuf:"bytes,4,opt,name=stderr,proto3" json:"stderr,omitempty"`
+	MessageIndex         int64    `protobuf:"varint,2,opt,name=message_index,json=messageIndex,proto3" json:"message_index,omitempty"`
+	Stdout               []byte   `protobuf:"bytes,3,opt,name=stdout,proto3" json:"stdout,omitempty"`
+	Stderr               []byte   `protobuf:"bytes,4,opt,name=stderr,proto3" json:"stderr,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StdOutputData) Reset()         { *m = StdOutputData{} }
+func (m *StdOutputData) String() string { return proto.CompactTextString(m) }
+func (*StdOutputData) ProtoMessage()    {}
+func (*StdOutputData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_messages_ac08e7a74db6a692, []int{0}
+}
+func (m *StdOutputData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StdOutputData.Unmarshal(m, b)
+}
+func (m *StdOutputData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StdOutputData.Marshal(b, m, deterministic)
+}
+func (dst *StdOutputData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StdOutputData.Merge(dst, src)
+}
+func (m *StdOutputData) XXX_Size() int {
+	return xxx_messageInfo_StdOutputData.Size(m)
+}
+func (m *StdOutputData) XXX_DiscardUnknown() {
+	xxx_messageInfo_StdOutputData.DiscardUnknown(m)
 }
 
-func (m *StdOutputData) Reset()                    { *m = StdOutputData{} }
-func (m *StdOutputData) String() string            { return proto.CompactTextString(m) }
-func (*StdOutputData) ProtoMessage()               {}
-func (*StdOutputData) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_StdOutputData proto.InternalMessageInfo
 
 func (m *StdOutputData) GetPid() int64 {
 	if m != nil {
@@ -63,10 +91,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/messages.proto", fileDescriptor1)
+	proto.RegisterFile("fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/messages.proto", fileDescriptor_messages_ac08e7a74db6a692)
 }
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_messages_ac08e7a74db6a692 = []byte{
 	// 179 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x8e, 0xc1, 0x8a, 0x83, 0x30,
 	0x10, 0x40, 0x71, 0x5d, 0x3c, 0x04, 0x85, 0x25, 0x87, 0x25, 0x47, 0xd9, 0xbd, 0x78, 0x32, 0x87,
diff --git a/fleetspeak/src/client/proto/fleetspeak_client/api.pb.go b/fleetspeak/src/client/proto/fleetspeak_client/api.pb.go
index 9ece4375..db406667 100644
--- a/fleetspeak/src/client/proto/fleetspeak_client/api.pb.go
+++ b/fleetspeak/src/client/proto/fleetspeak_client/api.pb.go
@@ -1,25 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: fleetspeak/src/client/proto/fleetspeak_client/api.proto
 
-/*
-Package fleetspeak_client is a generated protocol buffer package.
-
-It is generated from these files:
-	fleetspeak/src/client/proto/fleetspeak_client/api.proto
-	fleetspeak/src/client/proto/fleetspeak_client/client.proto
-
-It has these top-level messages:
-	ByteBlob
-	APIMessage
-	CommunicatorConfig
-	ClientState
-*/
 package fleetspeak_client
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/any"
+import any "github.com/golang/protobuf/ptypes/any"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -33,13 +20,35 @@ var _ = math.Inf
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type ByteBlob struct {
-	Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
+	Data                 []byte   `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ByteBlob) Reset()                    { *m = ByteBlob{} }
-func (m *ByteBlob) String() string            { return proto.CompactTextString(m) }
-func (*ByteBlob) ProtoMessage()               {}
-func (*ByteBlob) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *ByteBlob) Reset()         { *m = ByteBlob{} }
+func (m *ByteBlob) String() string { return proto.CompactTextString(m) }
+func (*ByteBlob) ProtoMessage()    {}
+func (*ByteBlob) Descriptor() ([]byte, []int) {
+	return fileDescriptor_api_65a37ffc031fbeec, []int{0}
+}
+func (m *ByteBlob) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ByteBlob.Unmarshal(m, b)
+}
+func (m *ByteBlob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ByteBlob.Marshal(b, m, deterministic)
+}
+func (dst *ByteBlob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ByteBlob.Merge(dst, src)
+}
+func (m *ByteBlob) XXX_Size() int {
+	return xxx_messageInfo_ByteBlob.Size(m)
+}
+func (m *ByteBlob) XXX_DiscardUnknown() {
+	xxx_messageInfo_ByteBlob.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ByteBlob proto.InternalMessageInfo
 
 func (m *ByteBlob) GetData() []byte {
 	if m != nil {
@@ -49,14 +58,36 @@ func (m *ByteBlob) GetData() []byte {
 }
 
 type APIMessage struct {
-	Type string               `protobuf:"bytes,1,opt,name=type" json:"type,omitempty"`
-	Data *google_protobuf.Any `protobuf:"bytes,2,opt,name=data" json:"data,omitempty"`
+	Type                 string   `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
+	Data                 *any.Any `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *APIMessage) Reset()         { *m = APIMessage{} }
+func (m *APIMessage) String() string { return proto.CompactTextString(m) }
+func (*APIMessage) ProtoMessage()    {}
+func (*APIMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_api_65a37ffc031fbeec, []int{1}
+}
+func (m *APIMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_APIMessage.Unmarshal(m, b)
+}
+func (m *APIMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_APIMessage.Marshal(b, m, deterministic)
+}
+func (dst *APIMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_APIMessage.Merge(dst, src)
+}
+func (m *APIMessage) XXX_Size() int {
+	return xxx_messageInfo_APIMessage.Size(m)
+}
+func (m *APIMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_APIMessage.DiscardUnknown(m)
 }
 
-func (m *APIMessage) Reset()                    { *m = APIMessage{} }
-func (m *APIMessage) String() string            { return proto.CompactTextString(m) }
-func (*APIMessage) ProtoMessage()               {}
-func (*APIMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_APIMessage proto.InternalMessageInfo
 
 func (m *APIMessage) GetType() string {
 	if m != nil {
@@ -65,7 +96,7 @@ func (m *APIMessage) GetType() string {
 	return ""
 }
 
-func (m *APIMessage) GetData() *google_protobuf.Any {
+func (m *APIMessage) GetData() *any.Any {
 	if m != nil {
 		return m.Data
 	}
@@ -78,10 +109,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/client/proto/fleetspeak_client/api.proto", fileDescriptor0)
+	proto.RegisterFile("fleetspeak/src/client/proto/fleetspeak_client/api.proto", fileDescriptor_api_65a37ffc031fbeec)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_api_65a37ffc031fbeec = []byte{
 	// 173 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x4f, 0xcb, 0x49, 0x4d,
 	0x2d, 0x29, 0x2e, 0x48, 0x4d, 0xcc, 0xd6, 0x2f, 0x2e, 0x4a, 0xd6, 0x4f, 0xce, 0xc9, 0x4c, 0xcd,
diff --git a/fleetspeak/src/client/proto/fleetspeak_client/client.pb.go b/fleetspeak/src/client/proto/fleetspeak_client/client.pb.go
index c4cfa8bc..14f506bb 100644
--- a/fleetspeak/src/client/proto/fleetspeak_client/client.pb.go
+++ b/fleetspeak/src/client/proto/fleetspeak_client/client.pb.go
@@ -12,6 +12,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
 // Parameters used to configure communicator plugins.
 type CommunicatorConfig struct {
 	// The longest possible wait before attempting to contact the server.  The
@@ -19,28 +25,50 @@ type CommunicatorConfig struct {
 	// there has been recent communication with the server.
 	//
 	// A default of 5 minutes is used if unset.
-	MaxPollDelaySeconds int32 `protobuf:"varint,2,opt,name=max_poll_delay_seconds,json=maxPollDelaySeconds" json:"max_poll_delay_seconds,omitempty"`
+	MaxPollDelaySeconds int32 `protobuf:"varint,2,opt,name=max_poll_delay_seconds,json=maxPollDelaySeconds,proto3" json:"max_poll_delay_seconds,omitempty"`
 	// The longest possible wait before attempting to contact the server when
 	// there is some data to transmit. The communicator may poll sooner if the
 	// buffer is full.
 	//
 	// A default of 5 seconds is used if unset.
-	MaxBufferDelaySeconds int32 `protobuf:"varint,3,opt,name=max_buffer_delay_seconds,json=maxBufferDelaySeconds" json:"max_buffer_delay_seconds,omitempty"`
+	MaxBufferDelaySeconds int32 `protobuf:"varint,3,opt,name=max_buffer_delay_seconds,json=maxBufferDelaySeconds,proto3" json:"max_buffer_delay_seconds,omitempty"`
 	// The minimum time to wait after a failure to reach any server.
 	//
 	// A default of 5 minutes is used if unset.
-	MinFailureDelaySeconds int32 `protobuf:"varint,4,opt,name=min_failure_delay_seconds,json=minFailureDelaySeconds" json:"min_failure_delay_seconds,omitempty"`
+	MinFailureDelaySeconds int32 `protobuf:"varint,4,opt,name=min_failure_delay_seconds,json=minFailureDelaySeconds,proto3" json:"min_failure_delay_seconds,omitempty"`
 	// If the communicator is unable to communicate with the server for this long,
 	// it should kill fleetspeak, in the hope that a restart will fix things.
 	//
 	// A default of 7 days is used if unset.
-	FailureSuicideTimeSeconds int32 `protobuf:"varint,5,opt,name=failure_suicide_time_seconds,json=failureSuicideTimeSeconds" json:"failure_suicide_time_seconds,omitempty"`
+	FailureSuicideTimeSeconds int32    `protobuf:"varint,5,opt,name=failure_suicide_time_seconds,json=failureSuicideTimeSeconds,proto3" json:"failure_suicide_time_seconds,omitempty"`
+	XXX_NoUnkeyedLiteral      struct{} `json:"-"`
+	XXX_unrecognized          []byte   `json:"-"`
+	XXX_sizecache             int32    `json:"-"`
+}
+
+func (m *CommunicatorConfig) Reset()         { *m = CommunicatorConfig{} }
+func (m *CommunicatorConfig) String() string { return proto.CompactTextString(m) }
+func (*CommunicatorConfig) ProtoMessage()    {}
+func (*CommunicatorConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_client_341421432342fac9, []int{0}
+}
+func (m *CommunicatorConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommunicatorConfig.Unmarshal(m, b)
+}
+func (m *CommunicatorConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommunicatorConfig.Marshal(b, m, deterministic)
+}
+func (dst *CommunicatorConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommunicatorConfig.Merge(dst, src)
+}
+func (m *CommunicatorConfig) XXX_Size() int {
+	return xxx_messageInfo_CommunicatorConfig.Size(m)
+}
+func (m *CommunicatorConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommunicatorConfig.DiscardUnknown(m)
 }
 
-func (m *CommunicatorConfig) Reset()                    { *m = CommunicatorConfig{} }
-func (m *CommunicatorConfig) String() string            { return proto.CompactTextString(m) }
-func (*CommunicatorConfig) ProtoMessage()               {}
-func (*CommunicatorConfig) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_CommunicatorConfig proto.InternalMessageInfo
 
 func (m *CommunicatorConfig) GetMaxPollDelaySeconds() int32 {
 	if m != nil {
@@ -77,16 +105,38 @@ type ClientState struct {
 	// client's id.
 	ClientKey []byte `protobuf:"bytes,1,opt,name=client_key,json=clientKey,proto3" json:"client_key,omitempty"`
 	// The most recent sequencing nonce received from the server.
-	SequencingNonce uint64 `protobuf:"varint,7,opt,name=sequencing_nonce,json=sequencingNonce" json:"sequencing_nonce,omitempty"`
+	SequencingNonce uint64 `protobuf:"varint,7,opt,name=sequencing_nonce,json=sequencingNonce,proto3" json:"sequencing_nonce,omitempty"`
 	// A set of revoked/blacklisted certificate serial numbers in big endian
 	// format. Not restricted, but normally at most 20 bytes. (RFC 3280)
-	RevokedCertSerials [][]byte `protobuf:"bytes,8,rep,name=revoked_cert_serials,json=revokedCertSerials,proto3" json:"revoked_cert_serials,omitempty"`
+	RevokedCertSerials   [][]byte `protobuf:"bytes,8,rep,name=revoked_cert_serials,json=revokedCertSerials,proto3" json:"revoked_cert_serials,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ClientState) Reset()         { *m = ClientState{} }
+func (m *ClientState) String() string { return proto.CompactTextString(m) }
+func (*ClientState) ProtoMessage()    {}
+func (*ClientState) Descriptor() ([]byte, []int) {
+	return fileDescriptor_client_341421432342fac9, []int{1}
+}
+func (m *ClientState) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClientState.Unmarshal(m, b)
+}
+func (m *ClientState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClientState.Marshal(b, m, deterministic)
+}
+func (dst *ClientState) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientState.Merge(dst, src)
+}
+func (m *ClientState) XXX_Size() int {
+	return xxx_messageInfo_ClientState.Size(m)
+}
+func (m *ClientState) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClientState.DiscardUnknown(m)
 }
 
-func (m *ClientState) Reset()                    { *m = ClientState{} }
-func (m *ClientState) String() string            { return proto.CompactTextString(m) }
-func (*ClientState) ProtoMessage()               {}
-func (*ClientState) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+var xxx_messageInfo_ClientState proto.InternalMessageInfo
 
 func (m *ClientState) GetClientKey() []byte {
 	if m != nil {
@@ -115,10 +165,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/client/proto/fleetspeak_client/client.proto", fileDescriptor1)
+	proto.RegisterFile("fleetspeak/src/client/proto/fleetspeak_client/client.proto", fileDescriptor_client_341421432342fac9)
 }
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_client_341421432342fac9 = []byte{
 	// 314 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x91, 0xcf, 0x4b, 0xc3, 0x30,
 	0x14, 0x80, 0xa9, 0xdb, 0xfc, 0x11, 0x07, 0x6a, 0xd4, 0xd1, 0x81, 0x42, 0xd9, 0xa9, 0x5e, 0x56,
diff --git a/fleetspeak/src/client/socketservice/proto/fleetspeak_socketservice/config.pb.go b/fleetspeak/src/client/socketservice/proto/fleetspeak_socketservice/config.pb.go
index d1c4a64f..db21a0ca 100644
--- a/fleetspeak/src/client/socketservice/proto/fleetspeak_socketservice/config.pb.go
+++ b/fleetspeak/src/client/socketservice/proto/fleetspeak_socketservice/config.pb.go
@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: fleetspeak/src/client/socketservice/proto/fleetspeak_socketservice/config.proto
 
-/*
-Package fleetspeak_socketservice is a generated protocol buffer package.
-
-It is generated from these files:
-	fleetspeak/src/client/socketservice/proto/fleetspeak_socketservice/config.proto
-
-It has these top-level messages:
-	Config
-*/
 package fleetspeak_socketservice
 
 import proto "github.com/golang/protobuf/proto"
@@ -39,22 +30,44 @@ type Config struct {
 	// Side note: FS requires the proxy's parent directory's perms to be 0700.
 	// If the parent directory doesn't exist, FS will mkdir -p it with perms set
 	// to 0700.
-	ApiProxyPath string `protobuf:"bytes,1,opt,name=api_proxy_path,json=apiProxyPath" json:"api_proxy_path,omitempty"`
+	ApiProxyPath string `protobuf:"bytes,1,opt,name=api_proxy_path,json=apiProxyPath,proto3" json:"api_proxy_path,omitempty"`
 	// By default, socket services report resource usage every 10 minutes. This
 	// flag disables this if set.
-	DisableResourceMonitoring bool `protobuf:"varint,2,opt,name=disable_resource_monitoring,json=disableResourceMonitoring" json:"disable_resource_monitoring,omitempty"`
+	DisableResourceMonitoring bool `protobuf:"varint,2,opt,name=disable_resource_monitoring,json=disableResourceMonitoring,proto3" json:"disable_resource_monitoring,omitempty"`
 	// How many samples to aggregate into a report when monitoring resource usage.
 	// If unset, defaults to 20.
-	ResourceMonitoringSampleSize int32 `protobuf:"varint,3,opt,name=resource_monitoring_sample_size,json=resourceMonitoringSampleSize" json:"resource_monitoring_sample_size,omitempty"`
+	ResourceMonitoringSampleSize int32 `protobuf:"varint,3,opt,name=resource_monitoring_sample_size,json=resourceMonitoringSampleSize,proto3" json:"resource_monitoring_sample_size,omitempty"`
 	// How long to wait between resource monitoring samples. If unset, defaults to
 	// 30 seconds.
-	ResourceMonitoringSamplePeriodSeconds int32 `protobuf:"varint,4,opt,name=resource_monitoring_sample_period_seconds,json=resourceMonitoringSamplePeriodSeconds" json:"resource_monitoring_sample_period_seconds,omitempty"`
+	ResourceMonitoringSamplePeriodSeconds int32    `protobuf:"varint,4,opt,name=resource_monitoring_sample_period_seconds,json=resourceMonitoringSamplePeriodSeconds,proto3" json:"resource_monitoring_sample_period_seconds,omitempty"`
+	XXX_NoUnkeyedLiteral                  struct{} `json:"-"`
+	XXX_unrecognized                      []byte   `json:"-"`
+	XXX_sizecache                         int32    `json:"-"`
+}
+
+func (m *Config) Reset()         { *m = Config{} }
+func (m *Config) String() string { return proto.CompactTextString(m) }
+func (*Config) ProtoMessage()    {}
+func (*Config) Descriptor() ([]byte, []int) {
+	return fileDescriptor_config_e9fd251f6e98c587, []int{0}
+}
+func (m *Config) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Config.Unmarshal(m, b)
+}
+func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
+}
+func (dst *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(dst, src)
+}
+func (m *Config) XXX_Size() int {
+	return xxx_messageInfo_Config.Size(m)
+}
+func (m *Config) XXX_DiscardUnknown() {
+	xxx_messageInfo_Config.DiscardUnknown(m)
 }
 
-func (m *Config) Reset()                    { *m = Config{} }
-func (m *Config) String() string            { return proto.CompactTextString(m) }
-func (*Config) ProtoMessage()               {}
-func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Config proto.InternalMessageInfo
 
 func (m *Config) GetApiProxyPath() string {
 	if m != nil {
@@ -89,10 +102,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/client/socketservice/proto/fleetspeak_socketservice/config.proto", fileDescriptor0)
+	proto.RegisterFile("fleetspeak/src/client/socketservice/proto/fleetspeak_socketservice/config.proto", fileDescriptor_config_e9fd251f6e98c587)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_config_e9fd251f6e98c587 = []byte{
 	// 243 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0xd0, 0xb1, 0x4b, 0x03, 0x31,
 	0x14, 0xc7, 0x71, 0xae, 0x6a, 0xd1, 0x20, 0x0e, 0x99, 0x22, 0x0a, 0x1e, 0xa2, 0x70, 0x2e, 0xcd,
diff --git a/fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/config.pb.go b/fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/config.pb.go
index 667a47f0..efad9843 100644
--- a/fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/config.pb.go
+++ b/fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/config.pb.go
@@ -1,18 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/config.proto
 
-/*
-Package fleetspeak_stdinservice is a generated protocol buffer package.
-
-It is generated from these files:
-	fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/config.proto
-	fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/messages.proto
-
-It has these top-level messages:
-	Config
-	InputMessage
-	OutputMessage
-*/
 package fleetspeak_stdinservice
 
 import proto "github.com/golang/protobuf/proto"
@@ -33,13 +21,35 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // The configuration information expected by stdinservice.Factory
 // in ClientServiceConfig.config.
 type Config struct {
-	Cmd string `protobuf:"bytes,1,opt,name=cmd" json:"cmd,omitempty"`
+	Cmd                  string   `protobuf:"bytes,1,opt,name=cmd,proto3" json:"cmd,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Config) Reset()         { *m = Config{} }
+func (m *Config) String() string { return proto.CompactTextString(m) }
+func (*Config) ProtoMessage()    {}
+func (*Config) Descriptor() ([]byte, []int) {
+	return fileDescriptor_config_d8f4376f47cde6c9, []int{0}
+}
+func (m *Config) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Config.Unmarshal(m, b)
+}
+func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
+}
+func (dst *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(dst, src)
+}
+func (m *Config) XXX_Size() int {
+	return xxx_messageInfo_Config.Size(m)
+}
+func (m *Config) XXX_DiscardUnknown() {
+	xxx_messageInfo_Config.DiscardUnknown(m)
 }
 
-func (m *Config) Reset()                    { *m = Config{} }
-func (m *Config) String() string            { return proto.CompactTextString(m) }
-func (*Config) ProtoMessage()               {}
-func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Config proto.InternalMessageInfo
 
 func (m *Config) GetCmd() string {
 	if m != nil {
@@ -53,10 +63,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/config.proto", fileDescriptor0)
+	proto.RegisterFile("fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/config.proto", fileDescriptor_config_d8f4376f47cde6c9)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_config_d8f4376f47cde6c9 = []byte{
 	// 116 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xf2, 0x4d, 0xcb, 0x49, 0x4d,
 	0x2d, 0x29, 0x2e, 0x48, 0x4d, 0xcc, 0xd6, 0x2f, 0x2e, 0x4a, 0xd6, 0x4f, 0xce, 0xc9, 0x4c, 0xcd,
diff --git a/fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/messages.pb.go b/fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/messages.pb.go
index a1e73863..5c7f294b 100644
--- a/fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/messages.pb.go
+++ b/fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/messages.pb.go
@@ -6,7 +6,7 @@ package fleetspeak_stdinservice
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/timestamp"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import fleetspeak_monitoring "github.com/google/fleetspeak/fleetspeak/src/common/proto/fleetspeak_monitoring"
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -14,17 +14,45 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
 type InputMessage struct {
 	// The data to be forwarded to the service.
 	Input []byte `protobuf:"bytes,1,opt,name=input,proto3" json:"input,omitempty"`
 	// Command line arguments.
-	Args []string `protobuf:"bytes,2,rep,name=args" json:"args,omitempty"`
+	Args                 []string `protobuf:"bytes,2,rep,name=args,proto3" json:"args,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *InputMessage) Reset()         { *m = InputMessage{} }
+func (m *InputMessage) String() string { return proto.CompactTextString(m) }
+func (*InputMessage) ProtoMessage()    {}
+func (*InputMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_messages_0dea43263330e4a8, []int{0}
+}
+func (m *InputMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InputMessage.Unmarshal(m, b)
+}
+func (m *InputMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InputMessage.Marshal(b, m, deterministic)
+}
+func (dst *InputMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputMessage.Merge(dst, src)
+}
+func (m *InputMessage) XXX_Size() int {
+	return xxx_messageInfo_InputMessage.Size(m)
+}
+func (m *InputMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_InputMessage.DiscardUnknown(m)
 }
 
-func (m *InputMessage) Reset()                    { *m = InputMessage{} }
-func (m *InputMessage) String() string            { return proto.CompactTextString(m) }
-func (*InputMessage) ProtoMessage()               {}
-func (*InputMessage) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_InputMessage proto.InternalMessageInfo
 
 func (m *InputMessage) GetInput() []byte {
 	if m != nil {
@@ -43,15 +71,37 @@ func (m *InputMessage) GetArgs() []string {
 type OutputMessage struct {
 	Stdout        []byte                                         `protobuf:"bytes,1,opt,name=stdout,proto3" json:"stdout,omitempty"`
 	Stderr        []byte                                         `protobuf:"bytes,2,opt,name=stderr,proto3" json:"stderr,omitempty"`
-	ResourceUsage *fleetspeak_monitoring.AggregatedResourceUsage `protobuf:"bytes,3,opt,name=resource_usage,json=resourceUsage" json:"resource_usage,omitempty"`
+	ResourceUsage *fleetspeak_monitoring.AggregatedResourceUsage `protobuf:"bytes,3,opt,name=resource_usage,json=resourceUsage,proto3" json:"resource_usage,omitempty"`
 	// When the message was generated.
-	Timestamp *google_protobuf.Timestamp `protobuf:"bytes,4,opt,name=timestamp" json:"timestamp,omitempty"`
+	Timestamp            *timestamp.Timestamp `protobuf:"bytes,4,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *OutputMessage) Reset()         { *m = OutputMessage{} }
+func (m *OutputMessage) String() string { return proto.CompactTextString(m) }
+func (*OutputMessage) ProtoMessage()    {}
+func (*OutputMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_messages_0dea43263330e4a8, []int{1}
+}
+func (m *OutputMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OutputMessage.Unmarshal(m, b)
+}
+func (m *OutputMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OutputMessage.Marshal(b, m, deterministic)
+}
+func (dst *OutputMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputMessage.Merge(dst, src)
+}
+func (m *OutputMessage) XXX_Size() int {
+	return xxx_messageInfo_OutputMessage.Size(m)
+}
+func (m *OutputMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_OutputMessage.DiscardUnknown(m)
 }
 
-func (m *OutputMessage) Reset()                    { *m = OutputMessage{} }
-func (m *OutputMessage) String() string            { return proto.CompactTextString(m) }
-func (*OutputMessage) ProtoMessage()               {}
-func (*OutputMessage) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+var xxx_messageInfo_OutputMessage proto.InternalMessageInfo
 
 func (m *OutputMessage) GetStdout() []byte {
 	if m != nil {
@@ -74,7 +124,7 @@ func (m *OutputMessage) GetResourceUsage() *fleetspeak_monitoring.AggregatedReso
 	return nil
 }
 
-func (m *OutputMessage) GetTimestamp() *google_protobuf.Timestamp {
+func (m *OutputMessage) GetTimestamp() *timestamp.Timestamp {
 	if m != nil {
 		return m.Timestamp
 	}
@@ -87,10 +137,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/messages.proto", fileDescriptor1)
+	proto.RegisterFile("fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/messages.proto", fileDescriptor_messages_0dea43263330e4a8)
 }
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_messages_0dea43263330e4a8 = []byte{
 	// 281 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0xbf, 0x4e, 0xf3, 0x30,
 	0x14, 0xc5, 0x95, 0xb6, 0x5f, 0xa5, 0xfa, 0x6b, 0x19, 0x2c, 0x04, 0x51, 0x16, 0xa2, 0x4e, 0x99,
diff --git a/fleetspeak/src/common/proto/fleetspeak/common.pb.go b/fleetspeak/src/common/proto/fleetspeak/common.pb.go
index b3a70f8f..c8e94977 100644
--- a/fleetspeak/src/common/proto/fleetspeak/common.pb.go
+++ b/fleetspeak/src/common/proto/fleetspeak/common.pb.go
@@ -1,39 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: fleetspeak/src/common/proto/fleetspeak/common.proto
 
-/*
-Package fleetspeak is a generated protocol buffer package.
-
-It is generated from these files:
-	fleetspeak/src/common/proto/fleetspeak/common.proto
-	fleetspeak/src/common/proto/fleetspeak/system.proto
-
-It has these top-level messages:
-	Address
-	ValidationInfo
-	Message
-	MessageResult
-	Label
-	Signature
-	WrappedContactData
-	ContactData
-	EmptyMessage
-	MessageAckData
-	MessageErrorData
-	ClientInfoData
-	RemoveServiceData
-	SignedClientServiceConfig
-	ClientServiceConfig
-	ClientServiceConfigs
-	RevokedCertificateList
-*/
 package fleetspeak
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/any"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
+import any "github.com/golang/protobuf/ptypes/any"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -70,7 +44,9 @@ var Message_Priority_value = map[string]int32{
 func (x Message_Priority) String() string {
 	return proto.EnumName(Message_Priority_name, int32(x))
 }
-func (Message_Priority) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (Message_Priority) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_b0fc9b0d8bf0eb05, []int{2, 0}
+}
 
 // An Address identifies the source or destination of a message.
 type Address struct {
@@ -79,13 +55,35 @@ type Address struct {
 	ClientId []byte `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
 	// The name of the fleetspeak service which sent or should receive the
 	// message.  Required.
-	ServiceName string `protobuf:"bytes,2,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName          string   `protobuf:"bytes,2,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Address) Reset()         { *m = Address{} }
+func (m *Address) String() string { return proto.CompactTextString(m) }
+func (*Address) ProtoMessage()    {}
+func (*Address) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_b0fc9b0d8bf0eb05, []int{0}
+}
+func (m *Address) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Address.Unmarshal(m, b)
+}
+func (m *Address) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Address.Marshal(b, m, deterministic)
+}
+func (dst *Address) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Address.Merge(dst, src)
+}
+func (m *Address) XXX_Size() int {
+	return xxx_messageInfo_Address.Size(m)
+}
+func (m *Address) XXX_DiscardUnknown() {
+	xxx_messageInfo_Address.DiscardUnknown(m)
 }
 
-func (m *Address) Reset()                    { *m = Address{} }
-func (m *Address) String() string            { return proto.CompactTextString(m) }
-func (*Address) ProtoMessage()               {}
-func (*Address) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Address proto.InternalMessageInfo
 
 func (m *Address) GetClientId() []byte {
 	if m != nil {
@@ -102,13 +100,35 @@ func (m *Address) GetServiceName() string {
 }
 
 type ValidationInfo struct {
-	Tags map[string]string `protobuf:"bytes,1,rep,name=tags" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Tags                 map[string]string `protobuf:"bytes,1,rep,name=tags,proto3" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *ValidationInfo) Reset()                    { *m = ValidationInfo{} }
-func (m *ValidationInfo) String() string            { return proto.CompactTextString(m) }
-func (*ValidationInfo) ProtoMessage()               {}
-func (*ValidationInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *ValidationInfo) Reset()         { *m = ValidationInfo{} }
+func (m *ValidationInfo) String() string { return proto.CompactTextString(m) }
+func (*ValidationInfo) ProtoMessage()    {}
+func (*ValidationInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_b0fc9b0d8bf0eb05, []int{1}
+}
+func (m *ValidationInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ValidationInfo.Unmarshal(m, b)
+}
+func (m *ValidationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ValidationInfo.Marshal(b, m, deterministic)
+}
+func (dst *ValidationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ValidationInfo.Merge(dst, src)
+}
+func (m *ValidationInfo) XXX_Size() int {
+	return xxx_messageInfo_ValidationInfo.Size(m)
+}
+func (m *ValidationInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_ValidationInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ValidationInfo proto.InternalMessageInfo
 
 func (m *ValidationInfo) GetTags() map[string]string {
 	if m != nil {
@@ -122,40 +142,62 @@ type Message struct {
 	// system on message intake and may be used for deduplication.
 	MessageId []byte `protobuf:"bytes,1,opt,name=message_id,json=messageId,proto3" json:"message_id,omitempty"`
 	// The source of the messages. Required.
-	Source *Address `protobuf:"bytes,2,opt,name=source" json:"source,omitempty"`
+	Source *Address `protobuf:"bytes,2,opt,name=source,proto3" json:"source,omitempty"`
 	// An sequence of bytes set by the source in a way to uniquely identify the
 	// message among all messages with the same origin.
 	SourceMessageId []byte `protobuf:"bytes,3,opt,name=source_message_id,json=sourceMessageId,proto3" json:"source_message_id,omitempty"`
 	// The destination of the message. Required.
-	Destination *Address `protobuf:"bytes,4,opt,name=destination" json:"destination,omitempty"`
+	Destination *Address `protobuf:"bytes,4,opt,name=destination,proto3" json:"destination,omitempty"`
 	// The type of message. This field is mostly opaque to the Fleetspeak system,
 	// but can be used for some statistics gathering. It is recommended that each
 	// service define a static collection of short readable message types and
 	// dispatch according to this when processing messages. e.g. "ResourceUsage",
 	// "StdOutputData".
-	MessageType string `protobuf:"bytes,5,opt,name=message_type,json=messageType" json:"message_type,omitempty"`
+	MessageType string `protobuf:"bytes,5,opt,name=message_type,json=messageType,proto3" json:"message_type,omitempty"`
 	// Set when the message enters the FS system.
-	CreationTime *google_protobuf1.Timestamp `protobuf:"bytes,6,opt,name=creation_time,json=creationTime" json:"creation_time,omitempty"`
+	CreationTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=creation_time,json=creationTime,proto3" json:"creation_time,omitempty"`
 	// The data associated with this request, accepted types are determined by the
 	// service and may depend on message_type. Not typically stored after the
 	// message is processed.
-	Data *google_protobuf.Any `protobuf:"bytes,7,opt,name=data" json:"data,omitempty"`
+	Data *any.Any `protobuf:"bytes,7,opt,name=data,proto3" json:"data,omitempty"`
 	// Additional validation information, set by on the server by the (optional)
 	// authorizer component based on WrappedContactData.validators, etc.
-	ValidationInfo *ValidationInfo `protobuf:"bytes,8,opt,name=validation_info,json=validationInfo" json:"validation_info,omitempty"`
+	ValidationInfo *ValidationInfo `protobuf:"bytes,8,opt,name=validation_info,json=validationInfo,proto3" json:"validation_info,omitempty"`
 	// The result of processing the message. Set once processing has finished.
-	Result   *MessageResult   `protobuf:"bytes,9,opt,name=result" json:"result,omitempty"`
-	Priority Message_Priority `protobuf:"varint,10,opt,name=priority,enum=fleetspeak.Message_Priority" json:"priority,omitempty"`
+	Result   *MessageResult   `protobuf:"bytes,9,opt,name=result,proto3" json:"result,omitempty"`
+	Priority Message_Priority `protobuf:"varint,10,opt,name=priority,proto3,enum=fleetspeak.Message_Priority" json:"priority,omitempty"`
 	// A background message does not count as activity when deciding how fast to
 	// poll the server. This flag should be set on messages which are unlikely to
 	// trigger additional activity.
-	Background bool `protobuf:"varint,11,opt,name=background" json:"background,omitempty"`
+	Background           bool     `protobuf:"varint,11,opt,name=background,proto3" json:"background,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Message) Reset()         { *m = Message{} }
+func (m *Message) String() string { return proto.CompactTextString(m) }
+func (*Message) ProtoMessage()    {}
+func (*Message) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_b0fc9b0d8bf0eb05, []int{2}
+}
+func (m *Message) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Message.Unmarshal(m, b)
+}
+func (m *Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Message.Marshal(b, m, deterministic)
+}
+func (dst *Message) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Message.Merge(dst, src)
+}
+func (m *Message) XXX_Size() int {
+	return xxx_messageInfo_Message.Size(m)
+}
+func (m *Message) XXX_DiscardUnknown() {
+	xxx_messageInfo_Message.DiscardUnknown(m)
 }
 
-func (m *Message) Reset()                    { *m = Message{} }
-func (m *Message) String() string            { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()               {}
-func (*Message) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_Message proto.InternalMessageInfo
 
 func (m *Message) GetMessageId() []byte {
 	if m != nil {
@@ -192,14 +234,14 @@ func (m *Message) GetMessageType() string {
 	return ""
 }
 
-func (m *Message) GetCreationTime() *google_protobuf1.Timestamp {
+func (m *Message) GetCreationTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreationTime
 	}
 	return nil
 }
 
-func (m *Message) GetData() *google_protobuf.Any {
+func (m *Message) GetData() *any.Any {
 	if m != nil {
 		return m.Data
 	}
@@ -236,19 +278,41 @@ func (m *Message) GetBackground() bool {
 
 type MessageResult struct {
 	// The time that processing finished.
-	ProcessedTime *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=processed_time,json=processedTime" json:"processed_time,omitempty"`
+	ProcessedTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=processed_time,json=processedTime,proto3" json:"processed_time,omitempty"`
 	// Set when processing ended with a permanent failure.
-	Failed bool `protobuf:"varint,3,opt,name=failed" json:"failed,omitempty"`
+	Failed bool `protobuf:"varint,3,opt,name=failed,proto3" json:"failed,omitempty"`
 	// A human readable error message, normally set when failed is true.
-	FailedReason string `protobuf:"bytes,4,opt,name=failed_reason,json=failedReason" json:"failed_reason,omitempty"`
+	FailedReason         string   `protobuf:"bytes,4,opt,name=failed_reason,json=failedReason,proto3" json:"failed_reason,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *MessageResult) Reset()         { *m = MessageResult{} }
+func (m *MessageResult) String() string { return proto.CompactTextString(m) }
+func (*MessageResult) ProtoMessage()    {}
+func (*MessageResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_b0fc9b0d8bf0eb05, []int{3}
+}
+func (m *MessageResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MessageResult.Unmarshal(m, b)
+}
+func (m *MessageResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MessageResult.Marshal(b, m, deterministic)
+}
+func (dst *MessageResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessageResult.Merge(dst, src)
+}
+func (m *MessageResult) XXX_Size() int {
+	return xxx_messageInfo_MessageResult.Size(m)
+}
+func (m *MessageResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_MessageResult.DiscardUnknown(m)
 }
 
-func (m *MessageResult) Reset()                    { *m = MessageResult{} }
-func (m *MessageResult) String() string            { return proto.CompactTextString(m) }
-func (*MessageResult) ProtoMessage()               {}
-func (*MessageResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_MessageResult proto.InternalMessageInfo
 
-func (m *MessageResult) GetProcessedTime() *google_protobuf1.Timestamp {
+func (m *MessageResult) GetProcessedTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ProcessedTime
 	}
@@ -273,15 +337,37 @@ func (m *MessageResult) GetFailedReason() string {
 // broadcasts to specific clients.
 type Label struct {
 	// The service which set this label.
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// A free form tag choosen by the setting plugin.
-	Label string `protobuf:"bytes,2,opt,name=label" json:"label,omitempty"`
+	Label                string   `protobuf:"bytes,2,opt,name=label,proto3" json:"label,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Label) Reset()         { *m = Label{} }
+func (m *Label) String() string { return proto.CompactTextString(m) }
+func (*Label) ProtoMessage()    {}
+func (*Label) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_b0fc9b0d8bf0eb05, []int{4}
+}
+func (m *Label) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Label.Unmarshal(m, b)
+}
+func (m *Label) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Label.Marshal(b, m, deterministic)
+}
+func (dst *Label) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Label.Merge(dst, src)
+}
+func (m *Label) XXX_Size() int {
+	return xxx_messageInfo_Label.Size(m)
+}
+func (m *Label) XXX_DiscardUnknown() {
+	xxx_messageInfo_Label.DiscardUnknown(m)
 }
 
-func (m *Label) Reset()                    { *m = Label{} }
-func (m *Label) String() string            { return proto.CompactTextString(m) }
-func (*Label) ProtoMessage()               {}
-func (*Label) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_Label proto.InternalMessageInfo
 
 func (m *Label) GetServiceName() string {
 	if m != nil {
@@ -302,16 +388,38 @@ type Signature struct {
 	Certificate [][]byte `protobuf:"bytes,1,rep,name=certificate,proto3" json:"certificate,omitempty"`
 	// Indicates the choice of signature algorithm, a constant from
 	// https://golang.org/pkg/crypto/x509/#SignatureAlgorithm
-	Algorithm int32 `protobuf:"varint,2,opt,name=algorithm" json:"algorithm,omitempty"`
+	Algorithm int32 `protobuf:"varint,2,opt,name=algorithm,proto3" json:"algorithm,omitempty"`
 	// A signature of the validated data, it should be consistent with both the
 	// algorithm choice and the first element of the certificate chain.
-	Signature []byte `protobuf:"bytes,3,opt,name=signature,proto3" json:"signature,omitempty"`
+	Signature            []byte   `protobuf:"bytes,3,opt,name=signature,proto3" json:"signature,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Signature) Reset()         { *m = Signature{} }
+func (m *Signature) String() string { return proto.CompactTextString(m) }
+func (*Signature) ProtoMessage()    {}
+func (*Signature) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_b0fc9b0d8bf0eb05, []int{5}
+}
+func (m *Signature) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Signature.Unmarshal(m, b)
+}
+func (m *Signature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Signature.Marshal(b, m, deterministic)
+}
+func (dst *Signature) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Signature.Merge(dst, src)
+}
+func (m *Signature) XXX_Size() int {
+	return xxx_messageInfo_Signature.Size(m)
+}
+func (m *Signature) XXX_DiscardUnknown() {
+	xxx_messageInfo_Signature.DiscardUnknown(m)
 }
 
-func (m *Signature) Reset()                    { *m = Signature{} }
-func (m *Signature) String() string            { return proto.CompactTextString(m) }
-func (*Signature) ProtoMessage()               {}
-func (*Signature) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_Signature proto.InternalMessageInfo
 
 func (m *Signature) GetCertificate() [][]byte {
 	if m != nil {
@@ -338,15 +446,37 @@ func (m *Signature) GetSignature() []byte {
 // contact.
 type WrappedContactData struct {
 	ContactData []byte       `protobuf:"bytes,1,opt,name=contact_data,json=contactData,proto3" json:"contact_data,omitempty"`
-	Signatures  []*Signature `protobuf:"bytes,2,rep,name=signatures" json:"signatures,omitempty"`
+	Signatures  []*Signature `protobuf:"bytes,2,rep,name=signatures,proto3" json:"signatures,omitempty"`
 	// contact_data.
-	ClientLabels []string `protobuf:"bytes,3,rep,name=client_labels,json=clientLabels" json:"client_labels,omitempty"`
+	ClientLabels         []string `protobuf:"bytes,3,rep,name=client_labels,json=clientLabels,proto3" json:"client_labels,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WrappedContactData) Reset()         { *m = WrappedContactData{} }
+func (m *WrappedContactData) String() string { return proto.CompactTextString(m) }
+func (*WrappedContactData) ProtoMessage()    {}
+func (*WrappedContactData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_b0fc9b0d8bf0eb05, []int{6}
+}
+func (m *WrappedContactData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WrappedContactData.Unmarshal(m, b)
+}
+func (m *WrappedContactData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WrappedContactData.Marshal(b, m, deterministic)
+}
+func (dst *WrappedContactData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WrappedContactData.Merge(dst, src)
+}
+func (m *WrappedContactData) XXX_Size() int {
+	return xxx_messageInfo_WrappedContactData.Size(m)
+}
+func (m *WrappedContactData) XXX_DiscardUnknown() {
+	xxx_messageInfo_WrappedContactData.DiscardUnknown(m)
 }
 
-func (m *WrappedContactData) Reset()                    { *m = WrappedContactData{} }
-func (m *WrappedContactData) String() string            { return proto.CompactTextString(m) }
-func (*WrappedContactData) ProtoMessage()               {}
-func (*WrappedContactData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_WrappedContactData proto.InternalMessageInfo
 
 func (m *WrappedContactData) GetContactData() []byte {
 	if m != nil {
@@ -374,27 +504,49 @@ type ContactData struct {
 	// During every contact, the server passes a random sequencing_nonce to the
 	// client, and the client provides the sequencing_nonce to the server during
 	// the next contact.
-	SequencingNonce uint64     `protobuf:"varint,1,opt,name=sequencing_nonce,json=sequencingNonce" json:"sequencing_nonce,omitempty"`
-	Messages        []*Message `protobuf:"bytes,2,rep,name=messages" json:"messages,omitempty"`
+	SequencingNonce uint64     `protobuf:"varint,1,opt,name=sequencing_nonce,json=sequencingNonce,proto3" json:"sequencing_nonce,omitempty"`
+	Messages        []*Message `protobuf:"bytes,2,rep,name=messages,proto3" json:"messages,omitempty"`
 	// Records the client's current time setting, as of the creation of this
 	// ContactData. Only set by the client.
-	ClientClock *google_protobuf1.Timestamp `protobuf:"bytes,3,opt,name=client_clock,json=clientClock" json:"client_clock,omitempty"`
+	ClientClock *timestamp.Timestamp `protobuf:"bytes,3,opt,name=client_clock,json=clientClock,proto3" json:"client_clock,omitempty"`
 	// If set, acknowledges receipt of a streamed WrappedContactData. This is used
 	// for control purposes during streaming connections.
-	AckIndex uint64 `protobuf:"varint,4,opt,name=ack_index,json=ackIndex" json:"ack_index,omitempty"`
+	AckIndex uint64 `protobuf:"varint,4,opt,name=ack_index,json=ackIndex,proto3" json:"ack_index,omitempty"`
 	// If set, indicates that the connection is shutting down and no more data
 	// will be sent.
-	DoneSending bool `protobuf:"varint,5,opt,name=done_sending,json=doneSending" json:"done_sending,omitempty"`
+	DoneSending bool `protobuf:"varint,5,opt,name=done_sending,json=doneSending,proto3" json:"done_sending,omitempty"`
 	// Set by the client to indicate how many messages it is willing to accept for
 	// each installed service. After the first exchange of an streaming connection, it
 	// represents the number of additional messages that will be accepted.
-	AllowedMessages map[string]uint64 `protobuf:"bytes,6,rep,name=AllowedMessages" json:"AllowedMessages,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	AllowedMessages      map[string]uint64 `protobuf:"bytes,6,rep,name=AllowedMessages,proto3" json:"AllowedMessages,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *ContactData) Reset()         { *m = ContactData{} }
+func (m *ContactData) String() string { return proto.CompactTextString(m) }
+func (*ContactData) ProtoMessage()    {}
+func (*ContactData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_b0fc9b0d8bf0eb05, []int{7}
+}
+func (m *ContactData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ContactData.Unmarshal(m, b)
+}
+func (m *ContactData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ContactData.Marshal(b, m, deterministic)
+}
+func (dst *ContactData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContactData.Merge(dst, src)
+}
+func (m *ContactData) XXX_Size() int {
+	return xxx_messageInfo_ContactData.Size(m)
+}
+func (m *ContactData) XXX_DiscardUnknown() {
+	xxx_messageInfo_ContactData.DiscardUnknown(m)
 }
 
-func (m *ContactData) Reset()                    { *m = ContactData{} }
-func (m *ContactData) String() string            { return proto.CompactTextString(m) }
-func (*ContactData) ProtoMessage()               {}
-func (*ContactData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_ContactData proto.InternalMessageInfo
 
 func (m *ContactData) GetSequencingNonce() uint64 {
 	if m != nil {
@@ -410,7 +562,7 @@ func (m *ContactData) GetMessages() []*Message {
 	return nil
 }
 
-func (m *ContactData) GetClientClock() *google_protobuf1.Timestamp {
+func (m *ContactData) GetClientClock() *timestamp.Timestamp {
 	if m != nil {
 		return m.ClientClock
 	}
@@ -440,31 +592,55 @@ func (m *ContactData) GetAllowedMessages() map[string]uint64 {
 
 // An empty message, typically used as a trivial RPC response.
 type EmptyMessage struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *EmptyMessage) Reset()         { *m = EmptyMessage{} }
+func (m *EmptyMessage) String() string { return proto.CompactTextString(m) }
+func (*EmptyMessage) ProtoMessage()    {}
+func (*EmptyMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_b0fc9b0d8bf0eb05, []int{8}
+}
+func (m *EmptyMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EmptyMessage.Unmarshal(m, b)
+}
+func (m *EmptyMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EmptyMessage.Marshal(b, m, deterministic)
+}
+func (dst *EmptyMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EmptyMessage.Merge(dst, src)
+}
+func (m *EmptyMessage) XXX_Size() int {
+	return xxx_messageInfo_EmptyMessage.Size(m)
+}
+func (m *EmptyMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_EmptyMessage.DiscardUnknown(m)
 }
 
-func (m *EmptyMessage) Reset()                    { *m = EmptyMessage{} }
-func (m *EmptyMessage) String() string            { return proto.CompactTextString(m) }
-func (*EmptyMessage) ProtoMessage()               {}
-func (*EmptyMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_EmptyMessage proto.InternalMessageInfo
 
 func init() {
 	proto.RegisterType((*Address)(nil), "fleetspeak.Address")
 	proto.RegisterType((*ValidationInfo)(nil), "fleetspeak.ValidationInfo")
+	proto.RegisterMapType((map[string]string)(nil), "fleetspeak.ValidationInfo.TagsEntry")
 	proto.RegisterType((*Message)(nil), "fleetspeak.Message")
 	proto.RegisterType((*MessageResult)(nil), "fleetspeak.MessageResult")
 	proto.RegisterType((*Label)(nil), "fleetspeak.Label")
 	proto.RegisterType((*Signature)(nil), "fleetspeak.Signature")
 	proto.RegisterType((*WrappedContactData)(nil), "fleetspeak.WrappedContactData")
 	proto.RegisterType((*ContactData)(nil), "fleetspeak.ContactData")
+	proto.RegisterMapType((map[string]uint64)(nil), "fleetspeak.ContactData.AllowedMessagesEntry")
 	proto.RegisterType((*EmptyMessage)(nil), "fleetspeak.EmptyMessage")
 	proto.RegisterEnum("fleetspeak.Message_Priority", Message_Priority_name, Message_Priority_value)
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/common/proto/fleetspeak/common.proto", fileDescriptor0)
+	proto.RegisterFile("fleetspeak/src/common/proto/fleetspeak/common.proto", fileDescriptor_common_b0fc9b0d8bf0eb05)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_common_b0fc9b0d8bf0eb05 = []byte{
 	// 849 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0x5d, 0x8f, 0xdb, 0x44,
 	0x14, 0xc5, 0x49, 0x36, 0x6b, 0x5f, 0x67, 0xb3, 0x61, 0xba, 0x20, 0x37, 0x14, 0x48, 0x0d, 0x0f,
diff --git a/fleetspeak/src/common/proto/fleetspeak/system.pb.go b/fleetspeak/src/common/proto/fleetspeak/system.pb.go
index 68930300..8d082ace 100644
--- a/fleetspeak/src/common/proto/fleetspeak/system.pb.go
+++ b/fleetspeak/src/common/proto/fleetspeak/system.pb.go
@@ -6,25 +6,53 @@ package fleetspeak
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/any"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
+import any "github.com/golang/protobuf/ptypes/any"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
 // A MessageAck message is sent from the client to the server to acknowledge the
 // successful receipt of one or more messages. Messages from the server to the
 // client may be repeated until ack'd.
 type MessageAckData struct {
-	MessageIds [][]byte `protobuf:"bytes,1,rep,name=message_ids,json=messageIds,proto3" json:"message_ids,omitempty"`
+	MessageIds           [][]byte `protobuf:"bytes,1,rep,name=message_ids,json=messageIds,proto3" json:"message_ids,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *MessageAckData) Reset()         { *m = MessageAckData{} }
+func (m *MessageAckData) String() string { return proto.CompactTextString(m) }
+func (*MessageAckData) ProtoMessage()    {}
+func (*MessageAckData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_system_4386732c28984e72, []int{0}
+}
+func (m *MessageAckData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MessageAckData.Unmarshal(m, b)
+}
+func (m *MessageAckData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MessageAckData.Marshal(b, m, deterministic)
+}
+func (dst *MessageAckData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessageAckData.Merge(dst, src)
+}
+func (m *MessageAckData) XXX_Size() int {
+	return xxx_messageInfo_MessageAckData.Size(m)
+}
+func (m *MessageAckData) XXX_DiscardUnknown() {
+	xxx_messageInfo_MessageAckData.DiscardUnknown(m)
 }
 
-func (m *MessageAckData) Reset()                    { *m = MessageAckData{} }
-func (m *MessageAckData) String() string            { return proto.CompactTextString(m) }
-func (*MessageAckData) ProtoMessage()               {}
-func (*MessageAckData) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_MessageAckData proto.InternalMessageInfo
 
 func (m *MessageAckData) GetMessageIds() [][]byte {
 	if m != nil {
@@ -36,14 +64,36 @@ func (m *MessageAckData) GetMessageIds() [][]byte {
 // A MessageError message is sent from the client to the server to indicate an
 // permanent error in processing the message.
 type MessageErrorData struct {
-	MessageId []byte `protobuf:"bytes,1,opt,name=message_id,json=messageId,proto3" json:"message_id,omitempty"`
-	Error     string `protobuf:"bytes,2,opt,name=error" json:"error,omitempty"`
+	MessageId            []byte   `protobuf:"bytes,1,opt,name=message_id,json=messageId,proto3" json:"message_id,omitempty"`
+	Error                string   `protobuf:"bytes,2,opt,name=error,proto3" json:"error,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *MessageErrorData) Reset()                    { *m = MessageErrorData{} }
-func (m *MessageErrorData) String() string            { return proto.CompactTextString(m) }
-func (*MessageErrorData) ProtoMessage()               {}
-func (*MessageErrorData) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (m *MessageErrorData) Reset()         { *m = MessageErrorData{} }
+func (m *MessageErrorData) String() string { return proto.CompactTextString(m) }
+func (*MessageErrorData) ProtoMessage()    {}
+func (*MessageErrorData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_system_4386732c28984e72, []int{1}
+}
+func (m *MessageErrorData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MessageErrorData.Unmarshal(m, b)
+}
+func (m *MessageErrorData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MessageErrorData.Marshal(b, m, deterministic)
+}
+func (dst *MessageErrorData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessageErrorData.Merge(dst, src)
+}
+func (m *MessageErrorData) XXX_Size() int {
+	return xxx_messageInfo_MessageErrorData.Size(m)
+}
+func (m *MessageErrorData) XXX_DiscardUnknown() {
+	xxx_messageInfo_MessageErrorData.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MessageErrorData proto.InternalMessageInfo
 
 func (m *MessageErrorData) GetMessageId() []byte {
 	if m != nil {
@@ -64,14 +114,36 @@ func (m *MessageErrorData) GetError() string {
 type ClientInfoData struct {
 	// Labels hardcoded by the client build, e.g. "client:Linux",
 	// "client:<build-nr>", "client:canary".
-	Labels   []*Label                    `protobuf:"bytes,1,rep,name=labels" json:"labels,omitempty"`
-	Services []*ClientInfoData_ServiceID `protobuf:"bytes,2,rep,name=services" json:"services,omitempty"`
+	Labels               []*Label                    `protobuf:"bytes,1,rep,name=labels,proto3" json:"labels,omitempty"`
+	Services             []*ClientInfoData_ServiceID `protobuf:"bytes,2,rep,name=services,proto3" json:"services,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
+}
+
+func (m *ClientInfoData) Reset()         { *m = ClientInfoData{} }
+func (m *ClientInfoData) String() string { return proto.CompactTextString(m) }
+func (*ClientInfoData) ProtoMessage()    {}
+func (*ClientInfoData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_system_4386732c28984e72, []int{2}
+}
+func (m *ClientInfoData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClientInfoData.Unmarshal(m, b)
+}
+func (m *ClientInfoData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClientInfoData.Marshal(b, m, deterministic)
+}
+func (dst *ClientInfoData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientInfoData.Merge(dst, src)
+}
+func (m *ClientInfoData) XXX_Size() int {
+	return xxx_messageInfo_ClientInfoData.Size(m)
+}
+func (m *ClientInfoData) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClientInfoData.DiscardUnknown(m)
 }
 
-func (m *ClientInfoData) Reset()                    { *m = ClientInfoData{} }
-func (m *ClientInfoData) String() string            { return proto.CompactTextString(m) }
-func (*ClientInfoData) ProtoMessage()               {}
-func (*ClientInfoData) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+var xxx_messageInfo_ClientInfoData proto.InternalMessageInfo
 
 func (m *ClientInfoData) GetLabels() []*Label {
 	if m != nil {
@@ -89,16 +161,38 @@ func (m *ClientInfoData) GetServices() []*ClientInfoData_ServiceID {
 
 type ClientInfoData_ServiceID struct {
 	// The name of the installed service.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The signature of the installed service, as provided in the AddServiceData
 	// message which created the service.
-	Signature []byte `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"`
+	Signature            []byte   `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ClientInfoData_ServiceID) Reset()         { *m = ClientInfoData_ServiceID{} }
+func (m *ClientInfoData_ServiceID) String() string { return proto.CompactTextString(m) }
+func (*ClientInfoData_ServiceID) ProtoMessage()    {}
+func (*ClientInfoData_ServiceID) Descriptor() ([]byte, []int) {
+	return fileDescriptor_system_4386732c28984e72, []int{2, 0}
+}
+func (m *ClientInfoData_ServiceID) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClientInfoData_ServiceID.Unmarshal(m, b)
+}
+func (m *ClientInfoData_ServiceID) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClientInfoData_ServiceID.Marshal(b, m, deterministic)
+}
+func (dst *ClientInfoData_ServiceID) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientInfoData_ServiceID.Merge(dst, src)
+}
+func (m *ClientInfoData_ServiceID) XXX_Size() int {
+	return xxx_messageInfo_ClientInfoData_ServiceID.Size(m)
+}
+func (m *ClientInfoData_ServiceID) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClientInfoData_ServiceID.DiscardUnknown(m)
 }
 
-func (m *ClientInfoData_ServiceID) Reset()                    { *m = ClientInfoData_ServiceID{} }
-func (m *ClientInfoData_ServiceID) String() string            { return proto.CompactTextString(m) }
-func (*ClientInfoData_ServiceID) ProtoMessage()               {}
-func (*ClientInfoData_ServiceID) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2, 0} }
+var xxx_messageInfo_ClientInfoData_ServiceID proto.InternalMessageInfo
 
 func (m *ClientInfoData_ServiceID) GetName() string {
 	if m != nil {
@@ -117,13 +211,35 @@ func (m *ClientInfoData_ServiceID) GetSignature() []byte {
 // A RemoveService message is sent from the server to the client to instruct the
 // client to remove an existing service.
 type RemoveServiceData struct {
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RemoveServiceData) Reset()         { *m = RemoveServiceData{} }
+func (m *RemoveServiceData) String() string { return proto.CompactTextString(m) }
+func (*RemoveServiceData) ProtoMessage()    {}
+func (*RemoveServiceData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_system_4386732c28984e72, []int{3}
+}
+func (m *RemoveServiceData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RemoveServiceData.Unmarshal(m, b)
+}
+func (m *RemoveServiceData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RemoveServiceData.Marshal(b, m, deterministic)
+}
+func (dst *RemoveServiceData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RemoveServiceData.Merge(dst, src)
+}
+func (m *RemoveServiceData) XXX_Size() int {
+	return xxx_messageInfo_RemoveServiceData.Size(m)
+}
+func (m *RemoveServiceData) XXX_DiscardUnknown() {
+	xxx_messageInfo_RemoveServiceData.DiscardUnknown(m)
 }
 
-func (m *RemoveServiceData) Reset()                    { *m = RemoveServiceData{} }
-func (m *RemoveServiceData) String() string            { return proto.CompactTextString(m) }
-func (*RemoveServiceData) ProtoMessage()               {}
-func (*RemoveServiceData) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+var xxx_messageInfo_RemoveServiceData proto.InternalMessageInfo
 
 func (m *RemoveServiceData) GetName() string {
 	if m != nil {
@@ -138,13 +254,35 @@ type SignedClientServiceConfig struct {
 	// A serialized ClientServiceConfig, defined below.
 	ServiceConfig []byte `protobuf:"bytes,1,opt,name=service_config,json=serviceConfig,proto3" json:"service_config,omitempty"`
 	// An RSASSA-PSS signature of service_config, made using a deployment key.
-	Signature []byte `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"`
+	Signature            []byte   `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SignedClientServiceConfig) Reset()         { *m = SignedClientServiceConfig{} }
+func (m *SignedClientServiceConfig) String() string { return proto.CompactTextString(m) }
+func (*SignedClientServiceConfig) ProtoMessage()    {}
+func (*SignedClientServiceConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_system_4386732c28984e72, []int{4}
+}
+func (m *SignedClientServiceConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SignedClientServiceConfig.Unmarshal(m, b)
+}
+func (m *SignedClientServiceConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SignedClientServiceConfig.Marshal(b, m, deterministic)
+}
+func (dst *SignedClientServiceConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SignedClientServiceConfig.Merge(dst, src)
+}
+func (m *SignedClientServiceConfig) XXX_Size() int {
+	return xxx_messageInfo_SignedClientServiceConfig.Size(m)
+}
+func (m *SignedClientServiceConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_SignedClientServiceConfig.DiscardUnknown(m)
 }
 
-func (m *SignedClientServiceConfig) Reset()                    { *m = SignedClientServiceConfig{} }
-func (m *SignedClientServiceConfig) String() string            { return proto.CompactTextString(m) }
-func (*SignedClientServiceConfig) ProtoMessage()               {}
-func (*SignedClientServiceConfig) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+var xxx_messageInfo_SignedClientServiceConfig proto.InternalMessageInfo
 
 func (m *SignedClientServiceConfig) GetServiceConfig() []byte {
 	if m != nil {
@@ -164,25 +302,47 @@ type ClientServiceConfig struct {
 	// The name that the service will be known as. Primary use is to address
 	// message to the service.  the service names 'server' and 'client' are
 	// reserved.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The name of the factory which will be used to generate the service.
-	Factory string `protobuf:"bytes,2,opt,name=factory" json:"factory,omitempty"`
+	Factory string `protobuf:"bytes,2,opt,name=factory,proto3" json:"factory,omitempty"`
 	// Additional configuration information for the factory to use when setting up
 	// the service. The expected type depends upon the factory.
-	Config *google_protobuf.Any `protobuf:"bytes,3,opt,name=config" json:"config,omitempty"`
+	Config *any.Any `protobuf:"bytes,3,opt,name=config,proto3" json:"config,omitempty"`
 	// The service will only be installed on clients with all of the listed
 	// labels. Note that labels for the special 'client' service are checked on
 	// the client. All other labels are only checked on the server.
-	RequiredLabels []*Label `protobuf:"bytes,6,rep,name=required_labels,json=requiredLabels" json:"required_labels,omitempty"`
+	RequiredLabels []*Label `protobuf:"bytes,6,rep,name=required_labels,json=requiredLabels,proto3" json:"required_labels,omitempty"`
 	// The time at which the service configuration was signed. Should be populated by
 	// the signing tool when creating a SignedClientServiceConfig.
-	SignedTime *google_protobuf1.Timestamp `protobuf:"bytes,7,opt,name=signed_time,json=signedTime" json:"signed_time,omitempty"`
+	SignedTime           *timestamp.Timestamp `protobuf:"bytes,7,opt,name=signed_time,json=signedTime,proto3" json:"signed_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *ClientServiceConfig) Reset()         { *m = ClientServiceConfig{} }
+func (m *ClientServiceConfig) String() string { return proto.CompactTextString(m) }
+func (*ClientServiceConfig) ProtoMessage()    {}
+func (*ClientServiceConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_system_4386732c28984e72, []int{5}
+}
+func (m *ClientServiceConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClientServiceConfig.Unmarshal(m, b)
+}
+func (m *ClientServiceConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClientServiceConfig.Marshal(b, m, deterministic)
+}
+func (dst *ClientServiceConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientServiceConfig.Merge(dst, src)
+}
+func (m *ClientServiceConfig) XXX_Size() int {
+	return xxx_messageInfo_ClientServiceConfig.Size(m)
+}
+func (m *ClientServiceConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClientServiceConfig.DiscardUnknown(m)
 }
 
-func (m *ClientServiceConfig) Reset()                    { *m = ClientServiceConfig{} }
-func (m *ClientServiceConfig) String() string            { return proto.CompactTextString(m) }
-func (*ClientServiceConfig) ProtoMessage()               {}
-func (*ClientServiceConfig) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+var xxx_messageInfo_ClientServiceConfig proto.InternalMessageInfo
 
 func (m *ClientServiceConfig) GetName() string {
 	if m != nil {
@@ -198,7 +358,7 @@ func (m *ClientServiceConfig) GetFactory() string {
 	return ""
 }
 
-func (m *ClientServiceConfig) GetConfig() *google_protobuf.Any {
+func (m *ClientServiceConfig) GetConfig() *any.Any {
 	if m != nil {
 		return m.Config
 	}
@@ -212,7 +372,7 @@ func (m *ClientServiceConfig) GetRequiredLabels() []*Label {
 	return nil
 }
 
-func (m *ClientServiceConfig) GetSignedTime() *google_protobuf1.Timestamp {
+func (m *ClientServiceConfig) GetSignedTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.SignedTime
 	}
@@ -220,13 +380,35 @@ func (m *ClientServiceConfig) GetSignedTime() *google_protobuf1.Timestamp {
 }
 
 type ClientServiceConfigs struct {
-	Config []*ClientServiceConfig `protobuf:"bytes,1,rep,name=config" json:"config,omitempty"`
+	Config               []*ClientServiceConfig `protobuf:"bytes,1,rep,name=config,proto3" json:"config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
+}
+
+func (m *ClientServiceConfigs) Reset()         { *m = ClientServiceConfigs{} }
+func (m *ClientServiceConfigs) String() string { return proto.CompactTextString(m) }
+func (*ClientServiceConfigs) ProtoMessage()    {}
+func (*ClientServiceConfigs) Descriptor() ([]byte, []int) {
+	return fileDescriptor_system_4386732c28984e72, []int{6}
+}
+func (m *ClientServiceConfigs) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClientServiceConfigs.Unmarshal(m, b)
+}
+func (m *ClientServiceConfigs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClientServiceConfigs.Marshal(b, m, deterministic)
+}
+func (dst *ClientServiceConfigs) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientServiceConfigs.Merge(dst, src)
+}
+func (m *ClientServiceConfigs) XXX_Size() int {
+	return xxx_messageInfo_ClientServiceConfigs.Size(m)
+}
+func (m *ClientServiceConfigs) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClientServiceConfigs.DiscardUnknown(m)
 }
 
-func (m *ClientServiceConfigs) Reset()                    { *m = ClientServiceConfigs{} }
-func (m *ClientServiceConfigs) String() string            { return proto.CompactTextString(m) }
-func (*ClientServiceConfigs) ProtoMessage()               {}
-func (*ClientServiceConfigs) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+var xxx_messageInfo_ClientServiceConfigs proto.InternalMessageInfo
 
 func (m *ClientServiceConfigs) GetConfig() []*ClientServiceConfig {
 	if m != nil {
@@ -237,13 +419,35 @@ func (m *ClientServiceConfigs) GetConfig() []*ClientServiceConfig {
 
 // A list of serial numbers of certificates which should be considered revoked.
 type RevokedCertificateList struct {
-	Serials [][]byte `protobuf:"bytes,1,rep,name=serials,proto3" json:"serials,omitempty"`
+	Serials              [][]byte `protobuf:"bytes,1,rep,name=serials,proto3" json:"serials,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RevokedCertificateList) Reset()         { *m = RevokedCertificateList{} }
+func (m *RevokedCertificateList) String() string { return proto.CompactTextString(m) }
+func (*RevokedCertificateList) ProtoMessage()    {}
+func (*RevokedCertificateList) Descriptor() ([]byte, []int) {
+	return fileDescriptor_system_4386732c28984e72, []int{7}
+}
+func (m *RevokedCertificateList) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RevokedCertificateList.Unmarshal(m, b)
+}
+func (m *RevokedCertificateList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RevokedCertificateList.Marshal(b, m, deterministic)
+}
+func (dst *RevokedCertificateList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RevokedCertificateList.Merge(dst, src)
+}
+func (m *RevokedCertificateList) XXX_Size() int {
+	return xxx_messageInfo_RevokedCertificateList.Size(m)
+}
+func (m *RevokedCertificateList) XXX_DiscardUnknown() {
+	xxx_messageInfo_RevokedCertificateList.DiscardUnknown(m)
 }
 
-func (m *RevokedCertificateList) Reset()                    { *m = RevokedCertificateList{} }
-func (m *RevokedCertificateList) String() string            { return proto.CompactTextString(m) }
-func (*RevokedCertificateList) ProtoMessage()               {}
-func (*RevokedCertificateList) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+var xxx_messageInfo_RevokedCertificateList proto.InternalMessageInfo
 
 func (m *RevokedCertificateList) GetSerials() [][]byte {
 	if m != nil {
@@ -265,10 +469,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/common/proto/fleetspeak/system.proto", fileDescriptor1)
+	proto.RegisterFile("fleetspeak/src/common/proto/fleetspeak/system.proto", fileDescriptor_system_4386732c28984e72)
 }
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_system_4386732c28984e72 = []byte{
 	// 485 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xef, 0x8a, 0xd3, 0x4e,
 	0x14, 0x25, 0xbb, 0xbf, 0x5f, 0xd7, 0xdc, 0xd6, 0xea, 0x8e, 0x45, 0xb2, 0x45, 0x69, 0x09, 0x8a,
diff --git a/fleetspeak/src/common/proto/fleetspeak_monitoring/resource.pb.go b/fleetspeak/src/common/proto/fleetspeak_monitoring/resource.pb.go
index 320af09f..f506743a 100644
--- a/fleetspeak/src/common/proto/fleetspeak_monitoring/resource.pb.go
+++ b/fleetspeak/src/common/proto/fleetspeak_monitoring/resource.pb.go
@@ -1,23 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: fleetspeak/src/common/proto/fleetspeak_monitoring/resource.proto
 
-/*
-Package fleetspeak_monitoring is a generated protocol buffer package.
-
-It is generated from these files:
-	fleetspeak/src/common/proto/fleetspeak_monitoring/resource.proto
-
-It has these top-level messages:
-	AggregatedResourceUsage
-	ResourceUsageData
-	KillNotification
-*/
 package fleetspeak_monitoring
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/timestamp"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -52,24 +41,48 @@ var KillNotification_Reason_value = map[string]int32{
 func (x KillNotification_Reason) String() string {
 	return proto.EnumName(KillNotification_Reason_name, int32(x))
 }
-func (KillNotification_Reason) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (KillNotification_Reason) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_resource_98ee7a613ec677ba, []int{2, 0}
+}
 
 // Contains resource-usage metrics for Fleetspeak clients. The stats are
 // arrived at by aggregating raw data retrieved from the OS.
 // CPU-usage is in milliseconds per second, and memory usage is in bytes.
 type AggregatedResourceUsage struct {
-	MeanUserCpuRate    float64 `protobuf:"fixed64,1,opt,name=mean_user_cpu_rate,json=meanUserCpuRate" json:"mean_user_cpu_rate,omitempty"`
-	MaxUserCpuRate     float64 `protobuf:"fixed64,2,opt,name=max_user_cpu_rate,json=maxUserCpuRate" json:"max_user_cpu_rate,omitempty"`
-	MeanSystemCpuRate  float64 `protobuf:"fixed64,3,opt,name=mean_system_cpu_rate,json=meanSystemCpuRate" json:"mean_system_cpu_rate,omitempty"`
-	MaxSystemCpuRate   float64 `protobuf:"fixed64,4,opt,name=max_system_cpu_rate,json=maxSystemCpuRate" json:"max_system_cpu_rate,omitempty"`
-	MeanResidentMemory float64 `protobuf:"fixed64,5,opt,name=mean_resident_memory,json=meanResidentMemory" json:"mean_resident_memory,omitempty"`
-	MaxResidentMemory  int64   `protobuf:"varint,6,opt,name=max_resident_memory,json=maxResidentMemory" json:"max_resident_memory,omitempty"`
+	MeanUserCpuRate      float64  `protobuf:"fixed64,1,opt,name=mean_user_cpu_rate,json=meanUserCpuRate,proto3" json:"mean_user_cpu_rate,omitempty"`
+	MaxUserCpuRate       float64  `protobuf:"fixed64,2,opt,name=max_user_cpu_rate,json=maxUserCpuRate,proto3" json:"max_user_cpu_rate,omitempty"`
+	MeanSystemCpuRate    float64  `protobuf:"fixed64,3,opt,name=mean_system_cpu_rate,json=meanSystemCpuRate,proto3" json:"mean_system_cpu_rate,omitempty"`
+	MaxSystemCpuRate     float64  `protobuf:"fixed64,4,opt,name=max_system_cpu_rate,json=maxSystemCpuRate,proto3" json:"max_system_cpu_rate,omitempty"`
+	MeanResidentMemory   float64  `protobuf:"fixed64,5,opt,name=mean_resident_memory,json=meanResidentMemory,proto3" json:"mean_resident_memory,omitempty"`
+	MaxResidentMemory    int64    `protobuf:"varint,6,opt,name=max_resident_memory,json=maxResidentMemory,proto3" json:"max_resident_memory,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AggregatedResourceUsage) Reset()         { *m = AggregatedResourceUsage{} }
+func (m *AggregatedResourceUsage) String() string { return proto.CompactTextString(m) }
+func (*AggregatedResourceUsage) ProtoMessage()    {}
+func (*AggregatedResourceUsage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resource_98ee7a613ec677ba, []int{0}
+}
+func (m *AggregatedResourceUsage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AggregatedResourceUsage.Unmarshal(m, b)
+}
+func (m *AggregatedResourceUsage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AggregatedResourceUsage.Marshal(b, m, deterministic)
+}
+func (dst *AggregatedResourceUsage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AggregatedResourceUsage.Merge(dst, src)
+}
+func (m *AggregatedResourceUsage) XXX_Size() int {
+	return xxx_messageInfo_AggregatedResourceUsage.Size(m)
+}
+func (m *AggregatedResourceUsage) XXX_DiscardUnknown() {
+	xxx_messageInfo_AggregatedResourceUsage.DiscardUnknown(m)
 }
 
-func (m *AggregatedResourceUsage) Reset()                    { *m = AggregatedResourceUsage{} }
-func (m *AggregatedResourceUsage) String() string            { return proto.CompactTextString(m) }
-func (*AggregatedResourceUsage) ProtoMessage()               {}
-func (*AggregatedResourceUsage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_AggregatedResourceUsage proto.InternalMessageInfo
 
 func (m *AggregatedResourceUsage) GetMeanUserCpuRate() float64 {
 	if m != nil {
@@ -122,26 +135,48 @@ type ResourceUsageData struct {
 	// Name of the client service that resource usage is charged/attributed to
 	// e.g 'system' for the system Fleetspeak service, or the name of a daemon
 	// service as specified in its config.
-	Scope string `protobuf:"bytes,1,opt,name=scope" json:"scope,omitempty"`
-	Pid   int64  `protobuf:"varint,2,opt,name=pid" json:"pid,omitempty"`
+	Scope string `protobuf:"bytes,1,opt,name=scope,proto3" json:"scope,omitempty"`
+	Pid   int64  `protobuf:"varint,2,opt,name=pid,proto3" json:"pid,omitempty"`
 	// The self reported service/service binary version.
-	Version string `protobuf:"bytes,8,opt,name=version" json:"version,omitempty"`
+	Version string `protobuf:"bytes,8,opt,name=version,proto3" json:"version,omitempty"`
 	// Time when the process was started by Fleetspeak.
-	ProcessStartTime *google_protobuf.Timestamp `protobuf:"bytes,3,opt,name=process_start_time,json=processStartTime" json:"process_start_time,omitempty"`
+	ProcessStartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=process_start_time,json=processStartTime,proto3" json:"process_start_time,omitempty"`
 	// Corresponds to when computation of the resource-usage data was finalized.
-	DataTimestamp *google_protobuf.Timestamp `protobuf:"bytes,4,opt,name=data_timestamp,json=dataTimestamp" json:"data_timestamp,omitempty"`
-	ResourceUsage *AggregatedResourceUsage   `protobuf:"bytes,5,opt,name=resource_usage,json=resourceUsage" json:"resource_usage,omitempty"`
+	DataTimestamp *timestamp.Timestamp     `protobuf:"bytes,4,opt,name=data_timestamp,json=dataTimestamp,proto3" json:"data_timestamp,omitempty"`
+	ResourceUsage *AggregatedResourceUsage `protobuf:"bytes,5,opt,name=resource_usage,json=resourceUsage,proto3" json:"resource_usage,omitempty"`
 	// Optional debug info for the process.
-	DebugStatus string `protobuf:"bytes,6,opt,name=debug_status,json=debugStatus" json:"debug_status,omitempty"`
+	DebugStatus string `protobuf:"bytes,6,opt,name=debug_status,json=debugStatus,proto3" json:"debug_status,omitempty"`
 	// If true, indicates that the process has terminated, and that this is
 	// the final resource-usage report for that process.
-	ProcessTerminated bool `protobuf:"varint,7,opt,name=process_terminated,json=processTerminated" json:"process_terminated,omitempty"`
+	ProcessTerminated    bool     `protobuf:"varint,7,opt,name=process_terminated,json=processTerminated,proto3" json:"process_terminated,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ResourceUsageData) Reset()         { *m = ResourceUsageData{} }
+func (m *ResourceUsageData) String() string { return proto.CompactTextString(m) }
+func (*ResourceUsageData) ProtoMessage()    {}
+func (*ResourceUsageData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resource_98ee7a613ec677ba, []int{1}
+}
+func (m *ResourceUsageData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ResourceUsageData.Unmarshal(m, b)
+}
+func (m *ResourceUsageData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ResourceUsageData.Marshal(b, m, deterministic)
+}
+func (dst *ResourceUsageData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResourceUsageData.Merge(dst, src)
+}
+func (m *ResourceUsageData) XXX_Size() int {
+	return xxx_messageInfo_ResourceUsageData.Size(m)
+}
+func (m *ResourceUsageData) XXX_DiscardUnknown() {
+	xxx_messageInfo_ResourceUsageData.DiscardUnknown(m)
 }
 
-func (m *ResourceUsageData) Reset()                    { *m = ResourceUsageData{} }
-func (m *ResourceUsageData) String() string            { return proto.CompactTextString(m) }
-func (*ResourceUsageData) ProtoMessage()               {}
-func (*ResourceUsageData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_ResourceUsageData proto.InternalMessageInfo
 
 func (m *ResourceUsageData) GetScope() string {
 	if m != nil {
@@ -164,14 +199,14 @@ func (m *ResourceUsageData) GetVersion() string {
 	return ""
 }
 
-func (m *ResourceUsageData) GetProcessStartTime() *google_protobuf.Timestamp {
+func (m *ResourceUsageData) GetProcessStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ProcessStartTime
 	}
 	return nil
 }
 
-func (m *ResourceUsageData) GetDataTimestamp() *google_protobuf.Timestamp {
+func (m *ResourceUsageData) GetDataTimestamp() *timestamp.Timestamp {
 	if m != nil {
 		return m.DataTimestamp
 	}
@@ -202,21 +237,43 @@ func (m *ResourceUsageData) GetProcessTerminated() bool {
 // Sent by clients when a service gets killed by Fleetspeak, e.g. for using
 // too much memory.
 type KillNotification struct {
-	Service string `protobuf:"bytes,1,opt,name=service" json:"service,omitempty"`
-	Pid     int64  `protobuf:"varint,2,opt,name=pid" json:"pid,omitempty"`
+	Service string `protobuf:"bytes,1,opt,name=service,proto3" json:"service,omitempty"`
+	Pid     int64  `protobuf:"varint,2,opt,name=pid,proto3" json:"pid,omitempty"`
 	// The self-reported version of the service.
-	Version string `protobuf:"bytes,3,opt,name=version" json:"version,omitempty"`
+	Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"`
 	// Time when the process was started by Fleetspeak.
-	ProcessStartTime *google_protobuf.Timestamp `protobuf:"bytes,4,opt,name=process_start_time,json=processStartTime" json:"process_start_time,omitempty"`
+	ProcessStartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=process_start_time,json=processStartTime,proto3" json:"process_start_time,omitempty"`
 	// Time when the process was killed by Fleetspeak.
-	KilledWhen *google_protobuf.Timestamp `protobuf:"bytes,5,opt,name=killed_when,json=killedWhen" json:"killed_when,omitempty"`
-	Reason     KillNotification_Reason    `protobuf:"varint,6,opt,name=reason,enum=fleetspeak.monitoring.KillNotification_Reason" json:"reason,omitempty"`
+	KilledWhen           *timestamp.Timestamp    `protobuf:"bytes,5,opt,name=killed_when,json=killedWhen,proto3" json:"killed_when,omitempty"`
+	Reason               KillNotification_Reason `protobuf:"varint,6,opt,name=reason,proto3,enum=fleetspeak.monitoring.KillNotification_Reason" json:"reason,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *KillNotification) Reset()         { *m = KillNotification{} }
+func (m *KillNotification) String() string { return proto.CompactTextString(m) }
+func (*KillNotification) ProtoMessage()    {}
+func (*KillNotification) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resource_98ee7a613ec677ba, []int{2}
+}
+func (m *KillNotification) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_KillNotification.Unmarshal(m, b)
+}
+func (m *KillNotification) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_KillNotification.Marshal(b, m, deterministic)
+}
+func (dst *KillNotification) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KillNotification.Merge(dst, src)
+}
+func (m *KillNotification) XXX_Size() int {
+	return xxx_messageInfo_KillNotification.Size(m)
+}
+func (m *KillNotification) XXX_DiscardUnknown() {
+	xxx_messageInfo_KillNotification.DiscardUnknown(m)
 }
 
-func (m *KillNotification) Reset()                    { *m = KillNotification{} }
-func (m *KillNotification) String() string            { return proto.CompactTextString(m) }
-func (*KillNotification) ProtoMessage()               {}
-func (*KillNotification) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_KillNotification proto.InternalMessageInfo
 
 func (m *KillNotification) GetService() string {
 	if m != nil {
@@ -239,14 +296,14 @@ func (m *KillNotification) GetVersion() string {
 	return ""
 }
 
-func (m *KillNotification) GetProcessStartTime() *google_protobuf.Timestamp {
+func (m *KillNotification) GetProcessStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ProcessStartTime
 	}
 	return nil
 }
 
-func (m *KillNotification) GetKilledWhen() *google_protobuf.Timestamp {
+func (m *KillNotification) GetKilledWhen() *timestamp.Timestamp {
 	if m != nil {
 		return m.KilledWhen
 	}
@@ -268,10 +325,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/common/proto/fleetspeak_monitoring/resource.proto", fileDescriptor0)
+	proto.RegisterFile("fleetspeak/src/common/proto/fleetspeak_monitoring/resource.proto", fileDescriptor_resource_98ee7a613ec677ba)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_resource_98ee7a613ec677ba = []byte{
 	// 582 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0xdd, 0x4e, 0xdb, 0x30,
 	0x14, 0x5e, 0x5b, 0x28, 0xe0, 0x8e, 0x92, 0x1a, 0xd0, 0x2a, 0x6e, 0xc6, 0x7a, 0xc5, 0x34, 0x91,
diff --git a/fleetspeak/src/demo/proto/fleetspeak_messagesaver/messagesaver.pb.go b/fleetspeak/src/demo/proto/fleetspeak_messagesaver/messagesaver.pb.go
index 26f3e176..20bb2e22 100644
--- a/fleetspeak/src/demo/proto/fleetspeak_messagesaver/messagesaver.pb.go
+++ b/fleetspeak/src/demo/proto/fleetspeak_messagesaver/messagesaver.pb.go
@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: fleetspeak/src/demo/proto/fleetspeak_messagesaver/messagesaver.proto
 
-/*
-Package fleetspeak_messagesaver is a generated protocol buffer package.
-
-It is generated from these files:
-	fleetspeak/src/demo/proto/fleetspeak_messagesaver/messagesaver.proto
-
-It has these top-level messages:
-	Config
-*/
 package fleetspeak_messagesaver
 
 import proto "github.com/golang/protobuf/proto"
@@ -28,13 +19,35 @@ var _ = math.Inf
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type Config struct {
-	Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"`
+	Path                 string   `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Config) Reset()         { *m = Config{} }
+func (m *Config) String() string { return proto.CompactTextString(m) }
+func (*Config) ProtoMessage()    {}
+func (*Config) Descriptor() ([]byte, []int) {
+	return fileDescriptor_messagesaver_6d75ac5e2545163f, []int{0}
+}
+func (m *Config) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Config.Unmarshal(m, b)
+}
+func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
+}
+func (dst *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(dst, src)
+}
+func (m *Config) XXX_Size() int {
+	return xxx_messageInfo_Config.Size(m)
+}
+func (m *Config) XXX_DiscardUnknown() {
+	xxx_messageInfo_Config.DiscardUnknown(m)
 }
 
-func (m *Config) Reset()                    { *m = Config{} }
-func (m *Config) String() string            { return proto.CompactTextString(m) }
-func (*Config) ProtoMessage()               {}
-func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Config proto.InternalMessageInfo
 
 func (m *Config) GetPath() string {
 	if m != nil {
@@ -48,10 +61,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/demo/proto/fleetspeak_messagesaver/messagesaver.proto", fileDescriptor0)
+	proto.RegisterFile("fleetspeak/src/demo/proto/fleetspeak_messagesaver/messagesaver.proto", fileDescriptor_messagesaver_6d75ac5e2545163f)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_messagesaver_6d75ac5e2545163f = []byte{
 	// 112 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x49, 0xcb, 0x49, 0x4d,
 	0x2d, 0x29, 0x2e, 0x48, 0x4d, 0xcc, 0xd6, 0x2f, 0x2e, 0x4a, 0xd6, 0x4f, 0x49, 0xcd, 0xcd, 0xd7,
diff --git a/fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr.pb.go b/fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr.pb.go
index f90e9444..effb89c2 100644
--- a/fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr.pb.go
+++ b/fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr.pb.go
@@ -1,21 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr.proto
 
-/*
-Package fleetspeak_frr is a generated protocol buffer package.
-
-It is generated from these files:
-	fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr.proto
-
-It has these top-level messages:
-	Config
-	TrafficRequestData
-	TrafficResponseData
-	FileRequestData
-	FileResponseData
-	MessageInfo
-	FileResponseInfo
-*/
 package fleetspeak_frr
 
 import proto "github.com/golang/protobuf/proto"
@@ -42,13 +27,35 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // Contains the information needed to configure a frr server component.
 type Config struct {
 	// The address to reach the master frr server over grpc.
-	MasterServer string `protobuf:"bytes,1,opt,name=master_server,json=masterServer" json:"master_server,omitempty"`
+	MasterServer         string   `protobuf:"bytes,1,opt,name=master_server,json=masterServer,proto3" json:"master_server,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Config) Reset()                    { *m = Config{} }
-func (m *Config) String() string            { return proto.CompactTextString(m) }
-func (*Config) ProtoMessage()               {}
-func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Config) Reset()         { *m = Config{} }
+func (m *Config) String() string { return proto.CompactTextString(m) }
+func (*Config) ProtoMessage()    {}
+func (*Config) Descriptor() ([]byte, []int) {
+	return fileDescriptor_frr_0896351b8c34f9b5, []int{0}
+}
+func (m *Config) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Config.Unmarshal(m, b)
+}
+func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
+}
+func (dst *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(dst, src)
+}
+func (m *Config) XXX_Size() int {
+	return xxx_messageInfo_Config.Size(m)
+}
+func (m *Config) XXX_DiscardUnknown() {
+	xxx_messageInfo_Config.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Config proto.InternalMessageInfo
 
 func (m *Config) GetMasterServer() string {
 	if m != nil {
@@ -61,24 +68,46 @@ func (m *Config) GetMasterServer() string {
 // client to send random data back.
 type TrafficRequestData struct {
 	// An identifier used to identify the frr master instance responsible for this.
-	MasterId int64 `protobuf:"varint,1,opt,name=master_id,json=masterId" json:"master_id,omitempty"`
+	MasterId int64 `protobuf:"varint,1,opt,name=master_id,json=masterId,proto3" json:"master_id,omitempty"`
 	// An identifier used to link responses to requests.
-	RequestId int64 `protobuf:"varint,2,opt,name=request_id,json=requestId" json:"request_id,omitempty"`
+	RequestId int64 `protobuf:"varint,2,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
 	// How many messages to send back for this request. Defaults to 1.
-	NumMessages int64 `protobuf:"varint,3,opt,name=num_messages,json=numMessages" json:"num_messages,omitempty"`
+	NumMessages int64 `protobuf:"varint,3,opt,name=num_messages,json=numMessages,proto3" json:"num_messages,omitempty"`
 	// How large should each message be, in bytes. Defaults to 1024.
-	MessageSize int64 `protobuf:"varint,4,opt,name=message_size,json=messageSize" json:"message_size,omitempty"`
+	MessageSize int64 `protobuf:"varint,4,opt,name=message_size,json=messageSize,proto3" json:"message_size,omitempty"`
 	// How long to wait between messages. Defaults to 0.
-	MessageDelayMs int64 `protobuf:"varint,5,opt,name=message_delay_ms,json=messageDelayMs" json:"message_delay_ms,omitempty"`
+	MessageDelayMs int64 `protobuf:"varint,5,opt,name=message_delay_ms,json=messageDelayMs,proto3" json:"message_delay_ms,omitempty"`
 	// How much to jitter the previous parameters - all parameters will be
 	// multiplied by a number between 1.0 and 1.0 + jitter.
-	Jitter float32 `protobuf:"fixed32,6,opt,name=jitter" json:"jitter,omitempty"`
+	Jitter               float32  `protobuf:"fixed32,6,opt,name=jitter,proto3" json:"jitter,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TrafficRequestData) Reset()         { *m = TrafficRequestData{} }
+func (m *TrafficRequestData) String() string { return proto.CompactTextString(m) }
+func (*TrafficRequestData) ProtoMessage()    {}
+func (*TrafficRequestData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_frr_0896351b8c34f9b5, []int{1}
+}
+func (m *TrafficRequestData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TrafficRequestData.Unmarshal(m, b)
+}
+func (m *TrafficRequestData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TrafficRequestData.Marshal(b, m, deterministic)
+}
+func (dst *TrafficRequestData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TrafficRequestData.Merge(dst, src)
+}
+func (m *TrafficRequestData) XXX_Size() int {
+	return xxx_messageInfo_TrafficRequestData.Size(m)
+}
+func (m *TrafficRequestData) XXX_DiscardUnknown() {
+	xxx_messageInfo_TrafficRequestData.DiscardUnknown(m)
 }
 
-func (m *TrafficRequestData) Reset()                    { *m = TrafficRequestData{} }
-func (m *TrafficRequestData) String() string            { return proto.CompactTextString(m) }
-func (*TrafficRequestData) ProtoMessage()               {}
-func (*TrafficRequestData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_TrafficRequestData proto.InternalMessageInfo
 
 func (m *TrafficRequestData) GetMasterId() int64 {
 	if m != nil {
@@ -123,18 +152,40 @@ func (m *TrafficRequestData) GetJitter() float32 {
 }
 
 type TrafficResponseData struct {
-	MasterId      int64  `protobuf:"varint,1,opt,name=master_id,json=masterId" json:"master_id,omitempty"`
-	RequestId     int64  `protobuf:"varint,2,opt,name=request_id,json=requestId" json:"request_id,omitempty"`
-	ResponseIndex int64  `protobuf:"varint,3,opt,name=response_index,json=responseIndex" json:"response_index,omitempty"`
+	MasterId      int64  `protobuf:"varint,1,opt,name=master_id,json=masterId,proto3" json:"master_id,omitempty"`
+	RequestId     int64  `protobuf:"varint,2,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
+	ResponseIndex int64  `protobuf:"varint,3,opt,name=response_index,json=responseIndex,proto3" json:"response_index,omitempty"`
 	Data          []byte `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"`
 	// Set when this is the last message responsive to the given request.
-	Fin bool `protobuf:"varint,5,opt,name=fin" json:"fin,omitempty"`
+	Fin                  bool     `protobuf:"varint,5,opt,name=fin,proto3" json:"fin,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *TrafficResponseData) Reset()                    { *m = TrafficResponseData{} }
-func (m *TrafficResponseData) String() string            { return proto.CompactTextString(m) }
-func (*TrafficResponseData) ProtoMessage()               {}
-func (*TrafficResponseData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *TrafficResponseData) Reset()         { *m = TrafficResponseData{} }
+func (m *TrafficResponseData) String() string { return proto.CompactTextString(m) }
+func (*TrafficResponseData) ProtoMessage()    {}
+func (*TrafficResponseData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_frr_0896351b8c34f9b5, []int{2}
+}
+func (m *TrafficResponseData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TrafficResponseData.Unmarshal(m, b)
+}
+func (m *TrafficResponseData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TrafficResponseData.Marshal(b, m, deterministic)
+}
+func (dst *TrafficResponseData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TrafficResponseData.Merge(dst, src)
+}
+func (m *TrafficResponseData) XXX_Size() int {
+	return xxx_messageInfo_TrafficResponseData.Size(m)
+}
+func (m *TrafficResponseData) XXX_DiscardUnknown() {
+	xxx_messageInfo_TrafficResponseData.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TrafficResponseData proto.InternalMessageInfo
 
 func (m *TrafficResponseData) GetMasterId() int64 {
 	if m != nil {
@@ -176,15 +227,37 @@ func (m *TrafficResponseData) GetFin() bool {
 type FileRequestData struct {
 	// An identifier used to identify the frr master instance
 	// responsible for this.
-	MasterId int64 `protobuf:"varint,1,opt,name=master_id,json=masterId" json:"master_id,omitempty"`
+	MasterId int64 `protobuf:"varint,1,opt,name=master_id,json=masterId,proto3" json:"master_id,omitempty"`
 	// The name of the file to download.
-	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *FileRequestData) Reset()                    { *m = FileRequestData{} }
-func (m *FileRequestData) String() string            { return proto.CompactTextString(m) }
-func (*FileRequestData) ProtoMessage()               {}
-func (*FileRequestData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *FileRequestData) Reset()         { *m = FileRequestData{} }
+func (m *FileRequestData) String() string { return proto.CompactTextString(m) }
+func (*FileRequestData) ProtoMessage()    {}
+func (*FileRequestData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_frr_0896351b8c34f9b5, []int{3}
+}
+func (m *FileRequestData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FileRequestData.Unmarshal(m, b)
+}
+func (m *FileRequestData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FileRequestData.Marshal(b, m, deterministic)
+}
+func (dst *FileRequestData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileRequestData.Merge(dst, src)
+}
+func (m *FileRequestData) XXX_Size() int {
+	return xxx_messageInfo_FileRequestData.Size(m)
+}
+func (m *FileRequestData) XXX_DiscardUnknown() {
+	xxx_messageInfo_FileRequestData.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FileRequestData proto.InternalMessageInfo
 
 func (m *FileRequestData) GetMasterId() int64 {
 	if m != nil {
@@ -206,17 +279,39 @@ func (m *FileRequestData) GetName() string {
 type FileResponseData struct {
 	// An identifier used to identify the frr master instance
 	// responsible for the underlying request.
-	MasterId int64 `protobuf:"varint,1,opt,name=master_id,json=masterId" json:"master_id,omitempty"`
+	MasterId int64 `protobuf:"varint,1,opt,name=master_id,json=masterId,proto3" json:"master_id,omitempty"`
 	// The name of the file that was downloaded.
-	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	// The size of the file that was downloaded.
-	Size uint64 `protobuf:"varint,3,opt,name=size" json:"size,omitempty"`
+	Size                 uint64   `protobuf:"varint,3,opt,name=size,proto3" json:"size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *FileResponseData) Reset()                    { *m = FileResponseData{} }
-func (m *FileResponseData) String() string            { return proto.CompactTextString(m) }
-func (*FileResponseData) ProtoMessage()               {}
-func (*FileResponseData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *FileResponseData) Reset()         { *m = FileResponseData{} }
+func (m *FileResponseData) String() string { return proto.CompactTextString(m) }
+func (*FileResponseData) ProtoMessage()    {}
+func (*FileResponseData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_frr_0896351b8c34f9b5, []int{4}
+}
+func (m *FileResponseData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FileResponseData.Unmarshal(m, b)
+}
+func (m *FileResponseData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FileResponseData.Marshal(b, m, deterministic)
+}
+func (dst *FileResponseData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileResponseData.Merge(dst, src)
+}
+func (m *FileResponseData) XXX_Size() int {
+	return xxx_messageInfo_FileResponseData.Size(m)
+}
+func (m *FileResponseData) XXX_DiscardUnknown() {
+	xxx_messageInfo_FileResponseData.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FileResponseData proto.InternalMessageInfo
 
 func (m *FileResponseData) GetMasterId() int64 {
 	if m != nil {
@@ -240,14 +335,36 @@ func (m *FileResponseData) GetSize() uint64 {
 }
 
 type MessageInfo struct {
-	ClientId []byte               `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
-	Data     *TrafficResponseData `protobuf:"bytes,2,opt,name=data" json:"data,omitempty"`
+	ClientId             []byte               `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
+	Data                 *TrafficResponseData `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *MessageInfo) Reset()                    { *m = MessageInfo{} }
-func (m *MessageInfo) String() string            { return proto.CompactTextString(m) }
-func (*MessageInfo) ProtoMessage()               {}
-func (*MessageInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *MessageInfo) Reset()         { *m = MessageInfo{} }
+func (m *MessageInfo) String() string { return proto.CompactTextString(m) }
+func (*MessageInfo) ProtoMessage()    {}
+func (*MessageInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_frr_0896351b8c34f9b5, []int{5}
+}
+func (m *MessageInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MessageInfo.Unmarshal(m, b)
+}
+func (m *MessageInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MessageInfo.Marshal(b, m, deterministic)
+}
+func (dst *MessageInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessageInfo.Merge(dst, src)
+}
+func (m *MessageInfo) XXX_Size() int {
+	return xxx_messageInfo_MessageInfo.Size(m)
+}
+func (m *MessageInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_MessageInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MessageInfo proto.InternalMessageInfo
 
 func (m *MessageInfo) GetClientId() []byte {
 	if m != nil {
@@ -264,14 +381,36 @@ func (m *MessageInfo) GetData() *TrafficResponseData {
 }
 
 type FileResponseInfo struct {
-	ClientId []byte            `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
-	Data     *FileResponseData `protobuf:"bytes,2,opt,name=data" json:"data,omitempty"`
+	ClientId             []byte            `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
+	Data                 *FileResponseData `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *FileResponseInfo) Reset()         { *m = FileResponseInfo{} }
+func (m *FileResponseInfo) String() string { return proto.CompactTextString(m) }
+func (*FileResponseInfo) ProtoMessage()    {}
+func (*FileResponseInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_frr_0896351b8c34f9b5, []int{6}
+}
+func (m *FileResponseInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FileResponseInfo.Unmarshal(m, b)
+}
+func (m *FileResponseInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FileResponseInfo.Marshal(b, m, deterministic)
+}
+func (dst *FileResponseInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileResponseInfo.Merge(dst, src)
+}
+func (m *FileResponseInfo) XXX_Size() int {
+	return xxx_messageInfo_FileResponseInfo.Size(m)
+}
+func (m *FileResponseInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_FileResponseInfo.DiscardUnknown(m)
 }
 
-func (m *FileResponseInfo) Reset()                    { *m = FileResponseInfo{} }
-func (m *FileResponseInfo) String() string            { return proto.CompactTextString(m) }
-func (*FileResponseInfo) ProtoMessage()               {}
-func (*FileResponseInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_FileResponseInfo proto.InternalMessageInfo
 
 func (m *FileResponseInfo) GetClientId() []byte {
 	if m != nil {
@@ -305,8 +444,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Master service
-
+// MasterClient is the client API for Master service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type MasterClient interface {
 	// RecordMessage records that a TrafficResponse message was received by
 	// the FS server.
@@ -326,7 +466,7 @@ func NewMasterClient(cc *grpc.ClientConn) MasterClient {
 
 func (c *masterClient) RecordTrafficResponse(ctx context.Context, in *MessageInfo, opts ...grpc.CallOption) (*fleetspeak.EmptyMessage, error) {
 	out := new(fleetspeak.EmptyMessage)
-	err := grpc.Invoke(ctx, "/fleetspeak.frr.Master/RecordTrafficResponse", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/fleetspeak.frr.Master/RecordTrafficResponse", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -335,15 +475,14 @@ func (c *masterClient) RecordTrafficResponse(ctx context.Context, in *MessageInf
 
 func (c *masterClient) RecordFileResponse(ctx context.Context, in *FileResponseInfo, opts ...grpc.CallOption) (*fleetspeak.EmptyMessage, error) {
 	out := new(fleetspeak.EmptyMessage)
-	err := grpc.Invoke(ctx, "/fleetspeak.frr.Master/RecordFileResponse", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/fleetspeak.frr.Master/RecordFileResponse", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Master service
-
+// MasterServer is the server API for Master service.
 type MasterServer interface {
 	// RecordMessage records that a TrafficResponse message was received by
 	// the FS server.
@@ -411,10 +550,10 @@ var _Master_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr.proto", fileDescriptor0)
+	proto.RegisterFile("fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr.proto", fileDescriptor_frr_0896351b8c34f9b5)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_frr_0896351b8c34f9b5 = []byte{
 	// 475 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0xdf, 0x6a, 0x13, 0x41,
 	0x14, 0xc6, 0xdd, 0x26, 0x86, 0xe4, 0x24, 0x8d, 0xe1, 0x88, 0xb2, 0xb4, 0x08, 0x71, 0x8b, 0x90,
diff --git a/fleetspeak/src/osquery/proto/fleetspeak_osquery/osquery.pb.go b/fleetspeak/src/osquery/proto/fleetspeak_osquery/osquery.pb.go
index 4baf76be..d4917d44 100644
--- a/fleetspeak/src/osquery/proto/fleetspeak_osquery/osquery.pb.go
+++ b/fleetspeak/src/osquery/proto/fleetspeak_osquery/osquery.pb.go
@@ -1,19 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: fleetspeak/src/osquery/proto/fleetspeak_osquery/osquery.proto
 
-/*
-Package fleetspeak_osquery is a generated protocol buffer package.
-
-It is generated from these files:
-	fleetspeak/src/osquery/proto/fleetspeak_osquery/osquery.proto
-
-It has these top-level messages:
-	LoggedResult
-	Queries
-	Row
-	Rows
-	QueryResults
-*/
 package fleetspeak_osquery
 
 import proto "github.com/golang/protobuf/proto"
@@ -50,7 +37,9 @@ var CompressionType_value = map[string]int32{
 func (x CompressionType) String() string {
 	return proto.EnumName(CompressionType_name, int32(x))
 }
-func (CompressionType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (CompressionType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_osquery_1549c664eafab991, []int{0}
+}
 
 type LoggedResult_Type int32
 
@@ -83,21 +72,45 @@ var LoggedResult_Type_value = map[string]int32{
 func (x LoggedResult_Type) String() string {
 	return proto.EnumName(LoggedResult_Type_name, int32(x))
 }
-func (LoggedResult_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+func (LoggedResult_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_osquery_1549c664eafab991, []int{0, 0}
+}
 
 // A LoggedResult message contains data provided to an osquery Logger, containing
 // e.g. query results from a snapshot query.
 type LoggedResult struct {
-	Type     LoggedResult_Type `protobuf:"varint,1,opt,name=type,enum=fleetspeak.osquery.LoggedResult_Type" json:"type,omitempty"`
-	Compress CompressionType   `protobuf:"varint,2,opt,name=compress,enum=fleetspeak.osquery.CompressionType" json:"compress,omitempty"`
+	Type     LoggedResult_Type `protobuf:"varint,1,opt,name=type,proto3,enum=fleetspeak.osquery.LoggedResult_Type" json:"type,omitempty"`
+	Compress CompressionType   `protobuf:"varint,2,opt,name=compress,proto3,enum=fleetspeak.osquery.CompressionType" json:"compress,omitempty"`
 	// JSON payload, encoded according to the compress attribute.
-	Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
+	Data                 []byte   `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LoggedResult) Reset()         { *m = LoggedResult{} }
+func (m *LoggedResult) String() string { return proto.CompactTextString(m) }
+func (*LoggedResult) ProtoMessage()    {}
+func (*LoggedResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_osquery_1549c664eafab991, []int{0}
+}
+func (m *LoggedResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LoggedResult.Unmarshal(m, b)
+}
+func (m *LoggedResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LoggedResult.Marshal(b, m, deterministic)
+}
+func (dst *LoggedResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LoggedResult.Merge(dst, src)
+}
+func (m *LoggedResult) XXX_Size() int {
+	return xxx_messageInfo_LoggedResult.Size(m)
+}
+func (m *LoggedResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_LoggedResult.DiscardUnknown(m)
 }
 
-func (m *LoggedResult) Reset()                    { *m = LoggedResult{} }
-func (m *LoggedResult) String() string            { return proto.CompactTextString(m) }
-func (*LoggedResult) ProtoMessage()               {}
-func (*LoggedResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_LoggedResult proto.InternalMessageInfo
 
 func (m *LoggedResult) GetType() LoggedResult_Type {
 	if m != nil {
@@ -124,17 +137,39 @@ func (m *LoggedResult) GetData() []byte {
 // osquery distributed inteface.
 type Queries struct {
 	// map from query name to SQL text.
-	Queries map[string]string `protobuf:"bytes,1,rep,name=queries" json:"queries,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Queries map[string]string `protobuf:"bytes,1,rep,name=queries,proto3" json:"queries,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// map from query name to SQL text. If a discovery query name matches an entry
 	// in queries, that entry will be executed only if the discovery query returns
 	// a result.
-	Discovery map[string]string `protobuf:"bytes,2,rep,name=discovery" json:"discovery,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Discovery            map[string]string `protobuf:"bytes,2,rep,name=discovery,proto3" json:"discovery,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *Queries) Reset()                    { *m = Queries{} }
-func (m *Queries) String() string            { return proto.CompactTextString(m) }
-func (*Queries) ProtoMessage()               {}
-func (*Queries) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *Queries) Reset()         { *m = Queries{} }
+func (m *Queries) String() string { return proto.CompactTextString(m) }
+func (*Queries) ProtoMessage()    {}
+func (*Queries) Descriptor() ([]byte, []int) {
+	return fileDescriptor_osquery_1549c664eafab991, []int{1}
+}
+func (m *Queries) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Queries.Unmarshal(m, b)
+}
+func (m *Queries) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Queries.Marshal(b, m, deterministic)
+}
+func (dst *Queries) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Queries.Merge(dst, src)
+}
+func (m *Queries) XXX_Size() int {
+	return xxx_messageInfo_Queries.Size(m)
+}
+func (m *Queries) XXX_DiscardUnknown() {
+	xxx_messageInfo_Queries.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Queries proto.InternalMessageInfo
 
 func (m *Queries) GetQueries() map[string]string {
 	if m != nil {
@@ -151,13 +186,35 @@ func (m *Queries) GetDiscovery() map[string]string {
 }
 
 type Row struct {
-	Row map[string]string `protobuf:"bytes,1,rep,name=row" json:"row,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Row                  map[string]string `protobuf:"bytes,1,rep,name=row,proto3" json:"row,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *Row) Reset()                    { *m = Row{} }
-func (m *Row) String() string            { return proto.CompactTextString(m) }
-func (*Row) ProtoMessage()               {}
-func (*Row) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *Row) Reset()         { *m = Row{} }
+func (m *Row) String() string { return proto.CompactTextString(m) }
+func (*Row) ProtoMessage()    {}
+func (*Row) Descriptor() ([]byte, []int) {
+	return fileDescriptor_osquery_1549c664eafab991, []int{2}
+}
+func (m *Row) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Row.Unmarshal(m, b)
+}
+func (m *Row) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Row.Marshal(b, m, deterministic)
+}
+func (dst *Row) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Row.Merge(dst, src)
+}
+func (m *Row) XXX_Size() int {
+	return xxx_messageInfo_Row.Size(m)
+}
+func (m *Row) XXX_DiscardUnknown() {
+	xxx_messageInfo_Row.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Row proto.InternalMessageInfo
 
 func (m *Row) GetRow() map[string]string {
 	if m != nil {
@@ -167,13 +224,35 @@ func (m *Row) GetRow() map[string]string {
 }
 
 type Rows struct {
-	Rows []*Row `protobuf:"bytes,1,rep,name=rows" json:"rows,omitempty"`
+	Rows                 []*Row   `protobuf:"bytes,1,rep,name=rows,proto3" json:"rows,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Rows) Reset()         { *m = Rows{} }
+func (m *Rows) String() string { return proto.CompactTextString(m) }
+func (*Rows) ProtoMessage()    {}
+func (*Rows) Descriptor() ([]byte, []int) {
+	return fileDescriptor_osquery_1549c664eafab991, []int{3}
+}
+func (m *Rows) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Rows.Unmarshal(m, b)
+}
+func (m *Rows) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Rows.Marshal(b, m, deterministic)
+}
+func (dst *Rows) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Rows.Merge(dst, src)
+}
+func (m *Rows) XXX_Size() int {
+	return xxx_messageInfo_Rows.Size(m)
+}
+func (m *Rows) XXX_DiscardUnknown() {
+	xxx_messageInfo_Rows.DiscardUnknown(m)
 }
 
-func (m *Rows) Reset()                    { *m = Rows{} }
-func (m *Rows) String() string            { return proto.CompactTextString(m) }
-func (*Rows) ProtoMessage()               {}
-func (*Rows) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_Rows proto.InternalMessageInfo
 
 func (m *Rows) GetRows() []*Row {
 	if m != nil {
@@ -185,18 +264,40 @@ func (m *Rows) GetRows() []*Row {
 // A QueryResults message contains one or more results for a query.
 type QueryResults struct {
 	// The query that these results are for.
-	QueryName string `protobuf:"bytes,1,opt,name=query_name,json=queryName" json:"query_name,omitempty"`
+	QueryName string `protobuf:"bytes,1,opt,name=query_name,json=queryName,proto3" json:"query_name,omitempty"`
 	// Status code for the execution of query_name, 0=OK.
-	Status   int64           `protobuf:"varint,2,opt,name=status" json:"status,omitempty"`
-	Compress CompressionType `protobuf:"varint,3,opt,name=compress,enum=fleetspeak.osquery.CompressionType" json:"compress,omitempty"`
+	Status   int64           `protobuf:"varint,2,opt,name=status,proto3" json:"status,omitempty"`
+	Compress CompressionType `protobuf:"varint,3,opt,name=compress,proto3,enum=fleetspeak.osquery.CompressionType" json:"compress,omitempty"`
 	// A serialized Rows message, compressed according to the compress attribued.
-	Rows []byte `protobuf:"bytes,4,opt,name=Rows,proto3" json:"Rows,omitempty"`
+	Rows                 []byte   `protobuf:"bytes,4,opt,name=Rows,proto3" json:"Rows,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *QueryResults) Reset()         { *m = QueryResults{} }
+func (m *QueryResults) String() string { return proto.CompactTextString(m) }
+func (*QueryResults) ProtoMessage()    {}
+func (*QueryResults) Descriptor() ([]byte, []int) {
+	return fileDescriptor_osquery_1549c664eafab991, []int{4}
+}
+func (m *QueryResults) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryResults.Unmarshal(m, b)
+}
+func (m *QueryResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryResults.Marshal(b, m, deterministic)
+}
+func (dst *QueryResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryResults.Merge(dst, src)
+}
+func (m *QueryResults) XXX_Size() int {
+	return xxx_messageInfo_QueryResults.Size(m)
+}
+func (m *QueryResults) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryResults.DiscardUnknown(m)
 }
 
-func (m *QueryResults) Reset()                    { *m = QueryResults{} }
-func (m *QueryResults) String() string            { return proto.CompactTextString(m) }
-func (*QueryResults) ProtoMessage()               {}
-func (*QueryResults) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_QueryResults proto.InternalMessageInfo
 
 func (m *QueryResults) GetQueryName() string {
 	if m != nil {
@@ -229,7 +330,10 @@ func (m *QueryResults) GetRows() []byte {
 func init() {
 	proto.RegisterType((*LoggedResult)(nil), "fleetspeak.osquery.LoggedResult")
 	proto.RegisterType((*Queries)(nil), "fleetspeak.osquery.Queries")
+	proto.RegisterMapType((map[string]string)(nil), "fleetspeak.osquery.Queries.DiscoveryEntry")
+	proto.RegisterMapType((map[string]string)(nil), "fleetspeak.osquery.Queries.QueriesEntry")
 	proto.RegisterType((*Row)(nil), "fleetspeak.osquery.Row")
+	proto.RegisterMapType((map[string]string)(nil), "fleetspeak.osquery.Row.RowEntry")
 	proto.RegisterType((*Rows)(nil), "fleetspeak.osquery.Rows")
 	proto.RegisterType((*QueryResults)(nil), "fleetspeak.osquery.QueryResults")
 	proto.RegisterEnum("fleetspeak.osquery.CompressionType", CompressionType_name, CompressionType_value)
@@ -237,10 +341,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/osquery/proto/fleetspeak_osquery/osquery.proto", fileDescriptor0)
+	proto.RegisterFile("fleetspeak/src/osquery/proto/fleetspeak_osquery/osquery.proto", fileDescriptor_osquery_1549c664eafab991)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_osquery_1549c664eafab991 = []byte{
 	// 486 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0x6d, 0x6b, 0xd3, 0x50,
 	0x14, 0xc7, 0x97, 0x87, 0xad, 0xed, 0x59, 0x98, 0x97, 0x83, 0x68, 0x28, 0x08, 0x25, 0x22, 0x94,
diff --git a/fleetspeak/src/server/components/authorizer/authorizer.go b/fleetspeak/src/server/components/authorizer/authorizer.go
new file mode 100644
index 00000000..47ff062b
--- /dev/null
+++ b/fleetspeak/src/server/components/authorizer/authorizer.go
@@ -0,0 +1,55 @@
+// Copyright 2019 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package authorizer provide generic implementations and utility methods
+// for Fleetspeak's authorizer component type.
+package authorizer
+
+import (
+	"net"
+
+	"github.com/google/fleetspeak/fleetspeak/src/server/authorizer"
+
+	fspb "github.com/google/fleetspeak/fleetspeak/src/common/proto/fleetspeak"
+)
+
+// LabelFilter is an authorizer.Authorizer which refuses connections from
+// clients that do not have a specific label.
+type LabelFilter struct {
+	Label string
+}
+
+// Allow1 implements Authorizer.
+func (f LabelFilter) Allow1(net.Addr) bool { return true }
+
+// Allow2 implements Authorizer.
+func (f LabelFilter) Allow2(_ net.Addr, i authorizer.ContactInfo) bool {
+	if f.Label == "" {
+		return true
+	}
+	for _, l := range i.ClientLabels {
+		if l == f.Label {
+			return true
+		}
+	}
+	return false
+}
+
+// Allow3 implements Authorizer.
+func (f LabelFilter) Allow3(net.Addr, authorizer.ContactInfo, authorizer.ClientInfo) bool { return true }
+
+// Allow4 implements Authorizer.
+func (f LabelFilter) Allow4(net.Addr, authorizer.ContactInfo, authorizer.ClientInfo, []authorizer.SignatureInfo) (bool, *fspb.ValidationInfo) {
+	return true, nil
+}
diff --git a/fleetspeak/src/server/components/components.go b/fleetspeak/src/server/components/components.go
new file mode 100644
index 00000000..3fabca87
--- /dev/null
+++ b/fleetspeak/src/server/components/components.go
@@ -0,0 +1,100 @@
+// Copyright 2019 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package components defines and instantiates the components needed by a
+// generic Fleetspeak server.
+//
+// Installations requiring specialized components should branch this, or
+// otherwise create a server.Components according to their needs.
+package components
+
+import (
+	"database/sql"
+	"errors"
+	"fmt"
+	"net"
+
+	"github.com/google/fleetspeak/fleetspeak/src/server"
+	"github.com/google/fleetspeak/fleetspeak/src/server/authorizer"
+	"github.com/google/fleetspeak/fleetspeak/src/server/comms"
+	cauthorizer "github.com/google/fleetspeak/fleetspeak/src/server/components/authorizer"
+	chttps "github.com/google/fleetspeak/fleetspeak/src/server/components/https"
+	"github.com/google/fleetspeak/fleetspeak/src/server/grpcservice"
+	"github.com/google/fleetspeak/fleetspeak/src/server/https"
+	"github.com/google/fleetspeak/fleetspeak/src/server/mysql"
+	"github.com/google/fleetspeak/fleetspeak/src/server/service"
+
+	cpb "github.com/google/fleetspeak/fleetspeak/src/server/components/proto/fleetspeak_components"
+)
+
+func MakeComponents(cfg cpb.Config) (*server.Components, error) {
+	if cfg.MysqlDataSourceName == "" {
+		return nil, errors.New("mysql_data_source_name is required")
+	}
+	if cfg.HttpsConfig == nil {
+		return nil, errors.New("https_config is required")
+	}
+	hcfg := cfg.HttpsConfig
+	if hcfg.ListenAddress == "" || hcfg.Certificates == "" || hcfg.Key == "" {
+		return nil, errors.New("https_config requires listen_address, certificates and key")
+	}
+
+	// Database setup
+	con, err := sql.Open("mysql", cfg.MysqlDataSourceName)
+	if err != nil {
+		return nil, fmt.Errorf("failed to open database: %v", err)
+	}
+
+	db, err := mysql.MakeDatastore(con)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create datastore: %v", err)
+	}
+
+	// Authorizer setup
+	var auth authorizer.Authorizer
+	if cfg.RequiredLabel == "" {
+		auth = authorizer.PermissiveAuthorizer{}
+	} else {
+		auth = cauthorizer.LabelFilter{Label: cfg.RequiredLabel}
+	}
+
+	// HTTPS setup
+	l, err := net.Listen("tcp", hcfg.ListenAddress)
+	if err != nil {
+		return nil, fmt.Errorf("failed to listen on [%v]: %v", cfg.HttpsConfig.ListenAddress, err)
+	}
+	if cfg.ProxyProtocol {
+		l = &chttps.ProxyListener{l}
+	}
+	comm, err := https.NewCommunicator(https.Params{
+		Listener:  l,
+		Cert:      []byte(hcfg.Certificates),
+		Key:       []byte(hcfg.Key),
+		Streaming: !hcfg.DisableStreaming,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("failed to create communicator: %v", err)
+	}
+
+	// Final assembly
+	return &server.Components{
+		Datastore: db,
+		ServiceFactories: map[string]service.Factory{
+			"GRPC": grpcservice.Factory,
+			"NOOP": service.NOOPFactory,
+		},
+		Communicators: []comms.Communicator{comm},
+		Authorizer:    auth,
+	}, nil
+}
diff --git a/fleetspeak/src/server/components/components_test.go b/fleetspeak/src/server/components/components_test.go
new file mode 100644
index 00000000..20e24b76
--- /dev/null
+++ b/fleetspeak/src/server/components/components_test.go
@@ -0,0 +1,53 @@
+// Copyright 2019 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package components
+
+import (
+	"testing"
+
+	cpb "github.com/google/fleetspeak/fleetspeak/src/server/components/proto/fleetspeak_components"
+)
+
+func TestValidation(t *testing.T) {
+	for _, tc := range []struct {
+		cfg     cpb.Config
+		wantErr string
+	}{
+		{
+			cfg:     cpb.Config{},
+			wantErr: "mysql_data_source_name is required",
+		},
+		{
+			cfg: cpb.Config{
+				MysqlDataSourceName: "fs:seecret@tcp(localhost:1234)/fsdb",
+			},
+			wantErr: "https_config is required",
+		},
+		{
+			cfg: cpb.Config{
+				MysqlDataSourceName: "fs:seecret@tcp(localhost:1234)/fsdb",
+				HttpsConfig: &cpb.HttpsConfig{
+					ListenAddress: "localhost:443",
+				},
+			},
+			wantErr: "https_config requires listen_address, certificates and key",
+		},
+	} {
+		_, err := MakeComponents(tc.cfg)
+		if err == nil || err.Error() != tc.wantErr {
+			t.Errorf("Expected error message [%v], got [%v]", tc.wantErr, err)
+		}
+	}
+}
diff --git a/fleetspeak/src/server/components/https/proxy.go b/fleetspeak/src/server/components/https/proxy.go
new file mode 100644
index 00000000..0dc85d0a
--- /dev/null
+++ b/fleetspeak/src/server/components/https/proxy.go
@@ -0,0 +1,75 @@
+// Copyright 2019 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package https provides generic implementations and utility methods for
+// Fleetspeak https communication component type.
+package https
+
+import (
+	"bufio"
+	"fmt"
+	"net"
+
+	log "github.com/golang/glog"
+
+	proxyproto "github.com/pires/go-proxyproto"
+)
+
+// ProxyListener wraps a net.Listener and adapts the perceived source of the connection
+// to be that provided by the PROXY protocol header string. Should be used only when the
+// server is behind a load balancer which implements the PROXY protocol.
+//
+// https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt
+type ProxyListener struct {
+	net.Listener
+}
+
+func (l *ProxyListener) Accept() (net.Conn, error) {
+	c, err := l.Listener.Accept()
+	if err != nil {
+		return c, err
+	}
+	r := bufio.NewReader(c)
+	h, err := proxyproto.Read(r)
+	if err == proxyproto.ErrNoProxyProtocol {
+		log.Warningf("Received connection from %v without proxy header.", c.RemoteAddr())
+		return &proxyConn{
+			Conn:   c,
+			reader: r,
+			remote: c.RemoteAddr(),
+		}, nil
+	}
+	if err != nil {
+		return nil, fmt.Errorf("error parsing proxy header: %v", err)
+	}
+	return &proxyConn{
+		Conn:   c,
+		reader: r,
+		remote: &net.TCPAddr{IP: h.SourceAddress, Port: int(h.SourcePort)},
+	}, nil
+}
+
+type proxyConn struct {
+	net.Conn
+	reader *bufio.Reader
+	remote net.Addr
+}
+
+func (c *proxyConn) Read(b []byte) (int, error) {
+	return c.reader.Read(b)
+}
+
+func (c *proxyConn) RemoteAddr() net.Addr {
+	return c.remote
+}
diff --git a/fleetspeak/src/server/components/proto/fleetspeak_components/config.pb.go b/fleetspeak/src/server/components/proto/fleetspeak_components/config.pb.go
new file mode 100644
index 00000000..a9b15684
--- /dev/null
+++ b/fleetspeak/src/server/components/proto/fleetspeak_components/config.pb.go
@@ -0,0 +1,194 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: fleetspeak/src/server/components/proto/fleetspeak_components/config.proto
+
+package fleetspeak_components
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
+type Config struct {
+	// Mysql connection string. Required.
+	//
+	// https://github.com/go-sql-driver/mysql#dsn-data-source-name
+	MysqlDataSourceName string `protobuf:"bytes,1,opt,name=mysql_data_source_name,json=mysqlDataSourceName,proto3" json:"mysql_data_source_name,omitempty"`
+	// The parameters required to stand up an https server. Required.
+	HttpsConfig *HttpsConfig `protobuf:"bytes,2,opt,name=https_config,json=httpsConfig,proto3" json:"https_config,omitempty"`
+	// If set, expects connections to arrive through a load balance implementing
+	// the PROXY protocol.
+	//
+	// https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt
+	ProxyProtocol bool `protobuf:"varint,3,opt,name=proxy_protocol,json=proxyProtocol,proto3" json:"proxy_protocol,omitempty"`
+	// If set, only clients reporting this label will be allowed to
+	// connect. Meant as a sanity check that the client and server are for the
+	// same Fleetspeak installation.
+	RequiredLabel        string   `protobuf:"bytes,4,opt,name=required_label,json=requiredLabel,proto3" json:"required_label,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Config) Reset()         { *m = Config{} }
+func (m *Config) String() string { return proto.CompactTextString(m) }
+func (*Config) ProtoMessage()    {}
+func (*Config) Descriptor() ([]byte, []int) {
+	return fileDescriptor_config_1974716300b16e7f, []int{0}
+}
+func (m *Config) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Config.Unmarshal(m, b)
+}
+func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
+}
+func (dst *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(dst, src)
+}
+func (m *Config) XXX_Size() int {
+	return xxx_messageInfo_Config.Size(m)
+}
+func (m *Config) XXX_DiscardUnknown() {
+	xxx_messageInfo_Config.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Config proto.InternalMessageInfo
+
+func (m *Config) GetMysqlDataSourceName() string {
+	if m != nil {
+		return m.MysqlDataSourceName
+	}
+	return ""
+}
+
+func (m *Config) GetHttpsConfig() *HttpsConfig {
+	if m != nil {
+		return m.HttpsConfig
+	}
+	return nil
+}
+
+func (m *Config) GetProxyProtocol() bool {
+	if m != nil {
+		return m.ProxyProtocol
+	}
+	return false
+}
+
+func (m *Config) GetRequiredLabel() string {
+	if m != nil {
+		return m.RequiredLabel
+	}
+	return ""
+}
+
+type HttpsConfig struct {
+	// The bind address to listen on for connections on, e.g. ":443" or
+	// "localhost:1234". Required.
+	ListenAddress string `protobuf:"bytes,1,opt,name=listen_address,json=listenAddress,proto3" json:"listen_address,omitempty"`
+	// A certificate chain which identifies the server to clients. Must lead to a
+	// certificate known to the clients. x509 format. Required.
+	Certificates string `protobuf:"bytes,2,opt,name=certificates,proto3" json:"certificates,omitempty"`
+	// The private key used to identify the server. Must match the first entry in
+	// certificates. x509 format. Required.
+	Key string `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"`
+	// If set, disables long running (streaming) connections.
+	DisableStreaming     bool     `protobuf:"varint,4,opt,name=disable_streaming,json=disableStreaming,proto3" json:"disable_streaming,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *HttpsConfig) Reset()         { *m = HttpsConfig{} }
+func (m *HttpsConfig) String() string { return proto.CompactTextString(m) }
+func (*HttpsConfig) ProtoMessage()    {}
+func (*HttpsConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_config_1974716300b16e7f, []int{1}
+}
+func (m *HttpsConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HttpsConfig.Unmarshal(m, b)
+}
+func (m *HttpsConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HttpsConfig.Marshal(b, m, deterministic)
+}
+func (dst *HttpsConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpsConfig.Merge(dst, src)
+}
+func (m *HttpsConfig) XXX_Size() int {
+	return xxx_messageInfo_HttpsConfig.Size(m)
+}
+func (m *HttpsConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_HttpsConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HttpsConfig proto.InternalMessageInfo
+
+func (m *HttpsConfig) GetListenAddress() string {
+	if m != nil {
+		return m.ListenAddress
+	}
+	return ""
+}
+
+func (m *HttpsConfig) GetCertificates() string {
+	if m != nil {
+		return m.Certificates
+	}
+	return ""
+}
+
+func (m *HttpsConfig) GetKey() string {
+	if m != nil {
+		return m.Key
+	}
+	return ""
+}
+
+func (m *HttpsConfig) GetDisableStreaming() bool {
+	if m != nil {
+		return m.DisableStreaming
+	}
+	return false
+}
+
+func init() {
+	proto.RegisterType((*Config)(nil), "fleetspeak.components.Config")
+	proto.RegisterType((*HttpsConfig)(nil), "fleetspeak.components.HttpsConfig")
+}
+
+func init() {
+	proto.RegisterFile("fleetspeak/src/server/components/proto/fleetspeak_components/config.proto", fileDescriptor_config_1974716300b16e7f)
+}
+
+var fileDescriptor_config_1974716300b16e7f = []byte{
+	// 307 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x8f, 0xe1, 0x6a, 0xf2, 0x30,
+	0x14, 0x86, 0xe9, 0xe7, 0x87, 0x68, 0xd4, 0xe1, 0x32, 0x36, 0xfa, 0x53, 0x0a, 0x03, 0x61, 0xd0,
+	0xc2, 0xbc, 0x82, 0xb1, 0x0d, 0x1c, 0x8c, 0x31, 0xea, 0x05, 0x84, 0x63, 0x7a, 0xd4, 0x60, 0x9a,
+	0xd4, 0x9c, 0x38, 0xe6, 0x95, 0xec, 0xbe, 0x76, 0x45, 0xa3, 0xa9, 0xd2, 0x09, 0xfb, 0xd7, 0x3e,
+	0xef, 0x43, 0xce, 0xfb, 0xb2, 0x97, 0x95, 0x46, 0xf4, 0x54, 0x21, 0x6c, 0x33, 0x72, 0x32, 0x23,
+	0x74, 0x1f, 0xe8, 0x32, 0x69, 0xcb, 0xca, 0x1a, 0x34, 0x9e, 0xb2, 0xca, 0x59, 0x6f, 0xb3, 0x56,
+	0x13, 0xbf, 0x32, 0x69, 0xcd, 0x4a, 0xad, 0xd3, 0xa0, 0xf0, 0xeb, 0xd6, 0x49, 0x5b, 0x27, 0xf9,
+	0x8e, 0x58, 0xf7, 0x31, 0x78, 0x7c, 0xc6, 0x6e, 0xca, 0x03, 0xed, 0xb4, 0x28, 0xc0, 0x83, 0x20,
+	0xbb, 0x77, 0x12, 0x85, 0x81, 0x12, 0xe3, 0x68, 0x12, 0x4d, 0xfb, 0xf9, 0x55, 0x48, 0x9f, 0xc0,
+	0xc3, 0x22, 0x64, 0x6f, 0x50, 0x22, 0x7f, 0x66, 0xc3, 0x8d, 0xf7, 0x15, 0x89, 0xe6, 0x58, 0xfc,
+	0x6f, 0x12, 0x4d, 0x07, 0xf7, 0x49, 0xfa, 0xe7, 0xb5, 0x74, 0x5e, 0xab, 0xcd, 0xb9, 0x7c, 0xb0,
+	0x69, 0x7f, 0xf8, 0x2d, 0xbb, 0xa8, 0x9c, 0xfd, 0x3c, 0x88, 0x50, 0x56, 0x5a, 0x1d, 0x77, 0x26,
+	0xd1, 0xb4, 0x97, 0x8f, 0x02, 0x7d, 0x3f, 0xc2, 0x5a, 0x73, 0xb8, 0xdb, 0x2b, 0x87, 0x85, 0xd0,
+	0xb0, 0x44, 0x1d, 0xff, 0x0f, 0xd5, 0x46, 0x27, 0xfa, 0x5a, 0xc3, 0xe4, 0x2b, 0x62, 0x83, 0xf9,
+	0xf9, 0xeb, 0x5a, 0x91, 0x47, 0x23, 0xa0, 0x28, 0x1c, 0x12, 0x1d, 0x17, 0x8d, 0x1a, 0xfa, 0xd0,
+	0x40, 0x9e, 0xb0, 0xa1, 0x44, 0xe7, 0xd5, 0x4a, 0x49, 0xf0, 0x48, 0x61, 0x4b, 0x3f, 0x3f, 0x63,
+	0x7c, 0xcc, 0x3a, 0x5b, 0x3c, 0x84, 0x76, 0xfd, 0xbc, 0xfe, 0xe4, 0x77, 0xec, 0xb2, 0x50, 0x04,
+	0x4b, 0x8d, 0x82, 0xbc, 0x43, 0x28, 0x95, 0x59, 0x87, 0x5a, 0xbd, 0x7c, 0x7c, 0x0c, 0x16, 0x27,
+	0xbe, 0xec, 0x86, 0x7d, 0xb3, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9d, 0x02, 0x59, 0xbf, 0xd9,
+	0x01, 0x00, 0x00,
+}
diff --git a/fleetspeak/src/server/components/proto/fleetspeak_components/config.proto b/fleetspeak/src/server/components/proto/fleetspeak_components/config.proto
new file mode 100644
index 00000000..8121623a
--- /dev/null
+++ b/fleetspeak/src/server/components/proto/fleetspeak_components/config.proto
@@ -0,0 +1,55 @@
+// Copyright 2019 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package fleetspeak.components;
+
+message Config {
+  // Mysql connection string. Required.
+  //
+  // https://github.com/go-sql-driver/mysql#dsn-data-source-name
+  string mysql_data_source_name = 1;
+
+  // The parameters required to stand up an https server. Required.
+  HttpsConfig https_config = 2;
+
+  // If set, expects connections to arrive through a load balance implementing
+  // the PROXY protocol.
+  //
+  // https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt
+  bool proxy_protocol = 3;
+
+  // If set, only clients reporting this label will be allowed to
+  // connect. Meant as a sanity check that the client and server are for the
+  // same Fleetspeak installation.
+  string required_label = 4;
+}
+
+message HttpsConfig {
+  // The bind address to listen on for connections on, e.g. ":443" or
+  // "localhost:1234". Required.
+  string listen_address = 1;
+
+  // A certificate chain which identifies the server to clients. Must lead to a
+  // certificate known to the clients. x509 format. Required.
+  string certificates = 2;
+
+  // The private key used to identify the server. Must match the first entry in
+  // certificates. x509 format. Required.
+  string key = 3;
+
+  // If set, disables long running (streaming) connections.
+  bool disable_streaming = 4;
+}
diff --git a/fleetspeak/src/server/grpcservice/proto/fleetspeak_grpcservice/grpcservice.pb.go b/fleetspeak/src/server/grpcservice/proto/fleetspeak_grpcservice/grpcservice.pb.go
index 239ac45a..bd914d22 100644
--- a/fleetspeak/src/server/grpcservice/proto/fleetspeak_grpcservice/grpcservice.pb.go
+++ b/fleetspeak/src/server/grpcservice/proto/fleetspeak_grpcservice/grpcservice.pb.go
@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: fleetspeak/src/server/grpcservice/proto/fleetspeak_grpcservice/grpcservice.proto
 
-/*
-Package fleetspeak_grpcservice is a generated protocol buffer package.
-
-It is generated from these files:
-	fleetspeak/src/server/grpcservice/proto/fleetspeak_grpcservice/grpcservice.proto
-
-It has these top-level messages:
-	Config
-*/
 package fleetspeak_grpcservice
 
 import proto "github.com/golang/protobuf/proto"
@@ -34,15 +25,37 @@ var _ = math.Inf
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type Config struct {
-	Target   string `protobuf:"bytes,1,opt,name=target" json:"target,omitempty"`
-	Insecure bool   `protobuf:"varint,2,opt,name=insecure" json:"insecure,omitempty"`
-	CertFile string `protobuf:"bytes,3,opt,name=cert_file,json=certFile" json:"cert_file,omitempty"`
+	Target               string   `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`
+	Insecure             bool     `protobuf:"varint,2,opt,name=insecure,proto3" json:"insecure,omitempty"`
+	CertFile             string   `protobuf:"bytes,3,opt,name=cert_file,json=certFile,proto3" json:"cert_file,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Config) Reset()                    { *m = Config{} }
-func (m *Config) String() string            { return proto.CompactTextString(m) }
-func (*Config) ProtoMessage()               {}
-func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Config) Reset()         { *m = Config{} }
+func (m *Config) String() string { return proto.CompactTextString(m) }
+func (*Config) ProtoMessage()    {}
+func (*Config) Descriptor() ([]byte, []int) {
+	return fileDescriptor_grpcservice_e2ed02c907788853, []int{0}
+}
+func (m *Config) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Config.Unmarshal(m, b)
+}
+func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
+}
+func (dst *Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Config.Merge(dst, src)
+}
+func (m *Config) XXX_Size() int {
+	return xxx_messageInfo_Config.Size(m)
+}
+func (m *Config) XXX_DiscardUnknown() {
+	xxx_messageInfo_Config.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Config proto.InternalMessageInfo
 
 func (m *Config) GetTarget() string {
 	if m != nil {
@@ -77,8 +90,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Processor service
-
+// ProcessorClient is the client API for Processor service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ProcessorClient interface {
 	// Process accepts message and processes it.
 	Process(ctx context.Context, in *fleetspeak.Message, opts ...grpc.CallOption) (*fleetspeak.EmptyMessage, error)
@@ -94,15 +108,14 @@ func NewProcessorClient(cc *grpc.ClientConn) ProcessorClient {
 
 func (c *processorClient) Process(ctx context.Context, in *fleetspeak.Message, opts ...grpc.CallOption) (*fleetspeak.EmptyMessage, error) {
 	out := new(fleetspeak.EmptyMessage)
-	err := grpc.Invoke(ctx, "/fleetspeak.grpcservice.Processor/Process", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/fleetspeak.grpcservice.Processor/Process", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Processor service
-
+// ProcessorServer is the server API for Processor service.
 type ProcessorServer interface {
 	// Process accepts message and processes it.
 	Process(context.Context, *fleetspeak.Message) (*fleetspeak.EmptyMessage, error)
@@ -144,10 +157,10 @@ var _Processor_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/server/grpcservice/proto/fleetspeak_grpcservice/grpcservice.proto", fileDescriptor0)
+	proto.RegisterFile("fleetspeak/src/server/grpcservice/proto/fleetspeak_grpcservice/grpcservice.proto", fileDescriptor_grpcservice_e2ed02c907788853)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_grpcservice_e2ed02c907788853 = []byte{
 	// 210 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x4f, 0xcf, 0x4b, 0x80, 0x30,
 	0x14, 0xce, 0x02, 0xd3, 0x1d, 0x17, 0xc8, 0xb0, 0x8b, 0x78, 0xf2, 0xe4, 0x20, 0x6f, 0x5d, 0xa3,
diff --git a/fleetspeak/src/server/plugins/authorizer/authorizer.go b/fleetspeak/src/server/plugins/authorizer/authorizer.go
deleted file mode 100644
index 5fbba46a..00000000
--- a/fleetspeak/src/server/plugins/authorizer/authorizer.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package main
-
-import (
-	"net"
-
-	log "github.com/golang/glog"
-
-	"github.com/google/fleetspeak/fleetspeak/src/server/authorizer"
-
-	fspb "github.com/google/fleetspeak/fleetspeak/src/common/proto/fleetspeak"
-)
-
-// LabelFilter is an AuthorizerFactory which returns an authorizer which only
-// allows clients reporting a specific label to connect.
-func LabelFilter(l string) (authorizer.Authorizer, error) {
-	return labelFilter{label: l}, nil
-}
-
-// labelFilter is an authorizer.Authorizer which refuses connections from
-// clients that do not have a specific label.
-type labelFilter struct {
-	label string
-}
-
-// Allow1 implements Authorizer.
-func (f labelFilter) Allow1(net.Addr) bool { return true }
-
-// Allow2 implements Authorizer.
-func (f labelFilter) Allow2(_ net.Addr, i authorizer.ContactInfo) bool {
-	if f.label == "" {
-		return true
-	}
-	for _, l := range i.ClientLabels {
-		if l == f.label {
-			return true
-		}
-	}
-	return false
-}
-
-// Allow3 implements Authorizer.
-func (f labelFilter) Allow3(net.Addr, authorizer.ContactInfo, authorizer.ClientInfo) bool { return true }
-
-// Allow4 implements Authorizer.
-func (f labelFilter) Allow4(net.Addr, authorizer.ContactInfo, authorizer.ClientInfo, []authorizer.SignatureInfo) (bool, *fspb.ValidationInfo) {
-	return true, nil
-}
-
-func main() {
-	log.Exitf("unimplemented")
-}
diff --git a/fleetspeak/src/server/plugins/grpc/grpc.go b/fleetspeak/src/server/plugins/grpc/grpc.go
deleted file mode 100644
index eebf3ac7..00000000
--- a/fleetspeak/src/server/plugins/grpc/grpc.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2017 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package main contains plugins involving the grpc protocol.
-package main
-
-import (
-	log "github.com/golang/glog"
-
-	"github.com/google/fleetspeak/fleetspeak/src/server/grpcservice"
-	"github.com/google/fleetspeak/fleetspeak/src/server/service"
-)
-
-func GRPCServiceFactoryFactory(_ string) (string, service.Factory, error) {
-	return "GRPC", grpcservice.Factory, nil
-}
-
-func main() {
-	log.Exitf("unimplemented")
-}
diff --git a/fleetspeak/src/server/plugins/https/https.go b/fleetspeak/src/server/plugins/https/https.go
deleted file mode 100644
index 613a028d..00000000
--- a/fleetspeak/src/server/plugins/https/https.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2018 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package https contains a plugin which provides https based communication with
-// clients.
-package main
-
-import (
-	"bufio"
-	"fmt"
-	"io/ioutil"
-	"net"
-
-	log "github.com/golang/glog"
-	"github.com/golang/protobuf/proto"
-	proxyproto "github.com/pires/go-proxyproto"
-
-	"github.com/google/fleetspeak/fleetspeak/src/server/comms"
-	"github.com/google/fleetspeak/fleetspeak/src/server/https"
-
-	ppb "github.com/google/fleetspeak/fleetspeak/src/server/plugins/proto/plugins"
-)
-
-// HTTPSFactory is a plugins.CommunicatorFactory which produces a communicator which expects to receive
-// direct https connections over TCP.
-func HTTPSFactory(configFile string) (comms.Communicator, error) {
-	b, err := ioutil.ReadFile(configFile)
-	if err != nil {
-		log.Exitf("Unable to read component config file [%s]: %v", configFile, err)
-	}
-	var c ppb.HttpsConfig
-	if err := proto.UnmarshalText(string(b), &c); err != nil {
-		log.Exitf("Unable to parse component config file [%s]: %v", configFile, err)
-	}
-	l, err := net.Listen("tcp", c.ListenAddress)
-	if err != nil {
-		return nil, fmt.Errorf("unable to listen on [%s]: %v", c.ListenAddress, err)
-	}
-	return https.NewCommunicator(https.Params{
-		Listener:  l,
-		Cert:      []byte(c.Certificate),
-		Key:       []byte(c.Key),
-		Streaming: c.Streaming,
-	})
-}
-
-// ProxyHTTPSFactory is a plugins.CommunicatorFactory which produces a
-// communicator which expects to receive https connections through a load
-// balancer implementing the Proxy protocol.
-//
-// Note that if this communicator's port is directly exposed to clients it would
-// be possible for them to effectively spoof their IP.
-func ProxyHTTPSFactory(configFile string) (comms.Communicator, error) {
-	b, err := ioutil.ReadFile(configFile)
-	if err != nil {
-		log.Exitf("Unable to read component config file [%s]: %v", configFile, err)
-	}
-	var c ppb.HttpsConfig
-	if err := proto.UnmarshalText(string(b), &c); err != nil {
-		log.Exitf("Unable to parse component config file [%s]: %v", configFile, err)
-	}
-	l, err := net.Listen("tcp", c.ListenAddress)
-	if err != nil {
-		return nil, fmt.Errorf("unable to listen on [%s]: %v", c.ListenAddress, err)
-	}
-	return https.NewCommunicator(https.Params{
-		Listener:  &proxyListener{l},
-		Cert:      []byte(c.Certificate),
-		Key:       []byte(c.Key),
-		Streaming: c.Streaming,
-	})
-}
-
-type proxyListener struct {
-	net.Listener
-}
-
-func (l *proxyListener) Accept() (net.Conn, error) {
-	c, err := l.Listener.Accept()
-	if err != nil {
-		return c, err
-	}
-	r := bufio.NewReader(c)
-	h, err := proxyproto.Read(r)
-	if err == proxyproto.ErrNoProxyProtocol {
-		log.Warningf("Received connection from %v without proxy header.", c.RemoteAddr())
-		return &proxyConn{
-			Conn:   c,
-			reader: r,
-			remote: c.RemoteAddr(),
-		}, nil
-	}
-	if err != nil {
-		return nil, fmt.Errorf("error parsing proxy header: %v", err)
-	}
-	return &proxyConn{
-		Conn:   c,
-		reader: r,
-		remote: &net.TCPAddr{IP: h.SourceAddress, Port: int(h.SourcePort)},
-	}, nil
-}
-
-type proxyConn struct {
-	net.Conn
-	reader *bufio.Reader
-	remote net.Addr
-}
-
-func (c *proxyConn) Read(b []byte) (int, error) {
-	return c.reader.Read(b)
-}
-
-func (c *proxyConn) RemoteAddr() net.Addr {
-	return c.remote
-}
-
-func main() {
-	log.Exitf("unimplemented")
-}
diff --git a/fleetspeak/src/server/plugins/loader.go b/fleetspeak/src/server/plugins/loader.go
deleted file mode 100644
index 2cb67860..00000000
--- a/fleetspeak/src/server/plugins/loader.go
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright 2018 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package plugins allows the dynamic creation and loading of fleetspeak
-// components, to be included in a Fleetspeak server.
-package plugins
-
-import (
-	"fmt"
-	"plugin"
-
-	"github.com/google/fleetspeak/fleetspeak/src/server"
-	"github.com/google/fleetspeak/fleetspeak/src/server/authorizer"
-	"github.com/google/fleetspeak/fleetspeak/src/server/comms"
-	"github.com/google/fleetspeak/fleetspeak/src/server/db"
-	"github.com/google/fleetspeak/fleetspeak/src/server/notifications"
-	"github.com/google/fleetspeak/fleetspeak/src/server/service"
-	"github.com/google/fleetspeak/fleetspeak/src/server/stats"
-
-	pb "github.com/google/fleetspeak/fleetspeak/src/server/plugins/proto/plugins"
-)
-
-// DatabaseFactory is a function which creates a db.Store from a configuration
-// string.
-type DatabaseFactory func(string) (db.Store, error)
-
-// ServiceFactoryFactory is a function which creates a named service.Factory from a
-// configuration string.
-type ServiceFactoryFactory func(string) (string, service.Factory, error)
-
-// CommunicatorFactory is a function which creates a comms.Communicator from a
-// configuration string.
-type CommunicatorFactory func(string) (comms.Communicator, error)
-
-// StatsCollectorFactory is a function which creates a stats.Collector from a
-// configuration string.
-type StatsCollectorFactory func(string) (stats.Collector, error)
-
-// AuthorizerFactory is a function which creates an authorizer.Authorizer from a
-// configuration string.
-type AuthorizerFactory func(string) (authorizer.Authorizer, error)
-
-// NotifierFactory is a function which creates an notifications.Notifier from a
-// configuration string.
-type NotifierFactory func(string) (notifications.Notifier, error)
-
-// ListenerFactory is a function which creates an notifications.Listener from a
-// configuration string.
-type ListenerFactory func(string) (notifications.Listener, error)
-
-func Load(conf *pb.Config) (server.Components, error) {
-	ds, err := LoadDatastore(conf.Datastore)
-	if err != nil {
-		return server.Components{}, err
-	}
-
-	sfs := make(map[string]service.Factory)
-	for _, p := range conf.ServiceFactory {
-		n, f, err := LoadServiceFactory(p)
-		if err != nil {
-			return server.Components{}, err
-		}
-		if sfs[n] != nil {
-			return server.Components{}, fmt.Errorf("duplicate service factory name [%v] created by %v.", n, p)
-		}
-		sfs[n] = f
-	}
-
-	var cs []comms.Communicator
-	for _, p := range conf.Communicator {
-		c, err := LoadCommunicator(p)
-		if err != nil {
-			return server.Components{}, err
-		}
-		cs = append(cs, c)
-	}
-
-	var sc stats.Collector
-	if conf.StatsCollector != nil {
-		var err error
-		sc, err = LoadStatsCollector(conf.StatsCollector)
-		if err != nil {
-			return server.Components{}, err
-		}
-	}
-
-	var au authorizer.Authorizer
-	if conf.Authorizer != nil {
-		var err error
-		au, err = LoadAuthorizer(conf.Authorizer)
-		if err != nil {
-			return server.Components{}, err
-		}
-	}
-
-	var n notifications.Notifier
-	if conf.Notifier != nil {
-		var err error
-		n, err = LoadNotifier(conf.Notifier)
-		if err != nil {
-			return server.Components{}, err
-		}
-	}
-
-	var l notifications.Listener
-	if conf.Listener != nil {
-		var err error
-		l, err = LoadListener(conf.Listener)
-		if err != nil {
-			return server.Components{}, err
-		}
-	}
-
-	return server.Components{
-		Datastore:        ds,
-		ServiceFactories: sfs,
-		Communicators:    cs,
-		Stats:            sc,
-		Authorizer:       au,
-		Notifier:         n,
-		Listener:         l,
-	}, nil
-}
-
-func LoadDatastore(p *pb.Plugin) (db.Store, error) {
-	f, err := loadFactory(p)
-	if err != nil {
-		return nil, err
-	}
-	df, ok := f.(DatabaseFactory)
-	if !ok {
-		return nil, fmt.Errorf("unable to load datastore from (%s:%s), expected DatabaseFactory got %T", p.Path, p.FactoryName, df)
-	}
-	return df(p.Config)
-}
-
-func LoadServiceFactory(p *pb.Plugin) (string, service.Factory, error) {
-	f, err := loadFactory(p)
-	if err != nil {
-		return "", nil, err
-	}
-	df, ok := f.(ServiceFactoryFactory)
-	if !ok {
-		return "", nil, fmt.Errorf("unable to load datastore from (%s:%s), expected ServiceFactoryFactory got %T", p.Path, p.FactoryName, df)
-	}
-	return df(p.Config)
-}
-
-func LoadCommunicator(p *pb.Plugin) (comms.Communicator, error) {
-	f, err := loadFactory(p)
-	if err != nil {
-		return nil, err
-	}
-	df, ok := f.(CommunicatorFactory)
-	if !ok {
-		return nil, fmt.Errorf("unable to load communicator from (%s:%s), expected CommunicatorFactory got %T", p.Path, p.FactoryName, df)
-	}
-	return df(p.Config)
-}
-
-func LoadStatsCollector(p *pb.Plugin) (stats.Collector, error) {
-	f, err := loadFactory(p)
-	if err != nil {
-		return nil, err
-	}
-	df, ok := f.(StatsCollectorFactory)
-	if !ok {
-		return nil, fmt.Errorf("unable to load stats collector from (%s:%s), expected StatsCollectorFactory got %T", p.Path, p.FactoryName, df)
-	}
-	return df(p.Config)
-}
-
-func LoadAuthorizer(p *pb.Plugin) (authorizer.Authorizer, error) {
-	f, err := loadFactory(p)
-	if err != nil {
-		return nil, err
-	}
-	df, ok := f.(AuthorizerFactory)
-	if !ok {
-		return nil, fmt.Errorf("unable to load authorizer from (%s:%s), expected AuthorizerFactory got %T", p.Path, p.FactoryName, df)
-	}
-	return df(p.Config)
-}
-
-func LoadNotifier(p *pb.Plugin) (notifications.Notifier, error) {
-	f, err := loadFactory(p)
-	if err != nil {
-		return nil, err
-	}
-	df, ok := f.(NotifierFactory)
-	if !ok {
-		return nil, fmt.Errorf("unable to load notifier from (%s:%s), expected NotifierFactory got %T", p.Path, p.FactoryName, df)
-	}
-	return df(p.Config)
-}
-
-func LoadListener(p *pb.Plugin) (notifications.Listener, error) {
-	f, err := loadFactory(p)
-	if err != nil {
-		return nil, err
-	}
-	df, ok := f.(ListenerFactory)
-	if !ok {
-		return nil, fmt.Errorf("unable to load listener from (%s:%s), expected ListenerFactory got %T", p.Path, p.FactoryName, df)
-	}
-	return df(p.Config)
-}
-
-func loadFactory(p *pb.Plugin) (plugin.Symbol, error) {
-	pl, err := plugin.Open(p.Path)
-	if err != nil {
-		return nil, err
-	}
-	return pl.Lookup(p.FactoryName)
-}
diff --git a/fleetspeak/src/server/plugins/mysql/mysql.go b/fleetspeak/src/server/plugins/mysql/mysql.go
deleted file mode 100644
index 99aef93e..00000000
--- a/fleetspeak/src/server/plugins/mysql/mysql.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2018 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package main contains a plugin which provides a mysql based datastore.
-package main
-
-import (
-	"database/sql"
-
-	log "github.com/golang/glog"
-
-	"github.com/google/fleetspeak/fleetspeak/src/server/db"
-	"github.com/google/fleetspeak/fleetspeak/src/server/mysql"
-
-	// We access the driver through sql.Open, but need to bring in the
-	// dependency.
-	_ "github.com/go-sql-driver/mysql"
-)
-
-// Factory is a plugins.DatabaseFactory which returns a mysql based
-// database. Its configuration string should be a connection string as accepted
-// by the mysql driver, e.g.: "<user>:<pass>@tcp(<host>)/<db>".
-//
-// See https://github.com/go-sql-driver/mysql#usage for more details.
-func Factory(cs string) (db.Store, error) {
-	c, err := sql.Open("mysql", cs)
-	if err != nil {
-		return nil, err
-	}
-	return mysql.MakeDatastore(c)
-}
-
-func main() {
-	log.Exitf("unimplemented")
-}
diff --git a/fleetspeak/src/server/plugins/proto/plugins/config.pb.go b/fleetspeak/src/server/plugins/proto/plugins/config.pb.go
deleted file mode 100644
index 14872467..00000000
--- a/fleetspeak/src/server/plugins/proto/plugins/config.pb.go
+++ /dev/null
@@ -1,214 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: fleetspeak/src/server/plugins/proto/plugins/config.proto
-
-/*
-Package fleetspeak_plugins is a generated protocol buffer package.
-
-It is generated from these files:
-	fleetspeak/src/server/plugins/proto/plugins/config.proto
-
-It has these top-level messages:
-	Plugin
-	Config
-	HttpsConfig
-*/
-package fleetspeak_plugins
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-// A Plugin message describes how to instantiate a FS component from a go plugin
-// file, as defined by go's plugin library: https://golang.org/pkg/plugin/
-type Plugin struct {
-	// The full path to the plugin file containing this component.
-	Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"`
-	// The name of a factory function exported by the file. It will be passed the
-	// config string and must be one of the *Factory types defined in the
-	// Fleetspeak server.plugins package.
-	FactoryName string `protobuf:"bytes,2,opt,name=factory_name,json=factoryName" json:"factory_name,omitempty"`
-	Config      string `protobuf:"bytes,3,opt,name=config" json:"config,omitempty"`
-}
-
-func (m *Plugin) Reset()                    { *m = Plugin{} }
-func (m *Plugin) String() string            { return proto.CompactTextString(m) }
-func (*Plugin) ProtoMessage()               {}
-func (*Plugin) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *Plugin) GetPath() string {
-	if m != nil {
-		return m.Path
-	}
-	return ""
-}
-
-func (m *Plugin) GetFactoryName() string {
-	if m != nil {
-		return m.FactoryName
-	}
-	return ""
-}
-
-func (m *Plugin) GetConfig() string {
-	if m != nil {
-		return m.Config
-	}
-	return ""
-}
-
-type Config struct {
-	Datastore      *Plugin   `protobuf:"bytes,1,opt,name=datastore" json:"datastore,omitempty"`
-	ServiceFactory []*Plugin `protobuf:"bytes,2,rep,name=service_factory,json=serviceFactory" json:"service_factory,omitempty"`
-	Communicator   []*Plugin `protobuf:"bytes,3,rep,name=communicator" json:"communicator,omitempty"`
-	StatsCollector *Plugin   `protobuf:"bytes,4,opt,name=stats_collector,json=statsCollector" json:"stats_collector,omitempty"`
-	Authorizer     *Plugin   `protobuf:"bytes,5,opt,name=authorizer" json:"authorizer,omitempty"`
-	Notifier       *Plugin   `protobuf:"bytes,6,opt,name=notifier" json:"notifier,omitempty"`
-	Listener       *Plugin   `protobuf:"bytes,7,opt,name=listener" json:"listener,omitempty"`
-}
-
-func (m *Config) Reset()                    { *m = Config{} }
-func (m *Config) String() string            { return proto.CompactTextString(m) }
-func (*Config) ProtoMessage()               {}
-func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-func (m *Config) GetDatastore() *Plugin {
-	if m != nil {
-		return m.Datastore
-	}
-	return nil
-}
-
-func (m *Config) GetServiceFactory() []*Plugin {
-	if m != nil {
-		return m.ServiceFactory
-	}
-	return nil
-}
-
-func (m *Config) GetCommunicator() []*Plugin {
-	if m != nil {
-		return m.Communicator
-	}
-	return nil
-}
-
-func (m *Config) GetStatsCollector() *Plugin {
-	if m != nil {
-		return m.StatsCollector
-	}
-	return nil
-}
-
-func (m *Config) GetAuthorizer() *Plugin {
-	if m != nil {
-		return m.Authorizer
-	}
-	return nil
-}
-
-func (m *Config) GetNotifier() *Plugin {
-	if m != nil {
-		return m.Notifier
-	}
-	return nil
-}
-
-func (m *Config) GetListener() *Plugin {
-	if m != nil {
-		return m.Listener
-	}
-	return nil
-}
-
-type HttpsConfig struct {
-	// The bind address to listen for connections on, e.g. ":443" or "localhost:1234".
-	ListenAddress string `protobuf:"bytes,1,opt,name=listen_address,json=listenAddress" json:"listen_address,omitempty"`
-	// A certificate chain which identifies the server to clients. x509 format.
-	Certificate string `protobuf:"bytes,2,opt,name=certificate" json:"certificate,omitempty"`
-	// The private key used to identify the server. Must match the first entry in
-	// certificates. x509 format.
-	Key string `protobuf:"bytes,3,opt,name=key" json:"key,omitempty"`
-	// If set includes support for streaming connections to clients.
-	Streaming bool `protobuf:"varint,4,opt,name=streaming" json:"streaming,omitempty"`
-}
-
-func (m *HttpsConfig) Reset()                    { *m = HttpsConfig{} }
-func (m *HttpsConfig) String() string            { return proto.CompactTextString(m) }
-func (*HttpsConfig) ProtoMessage()               {}
-func (*HttpsConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-func (m *HttpsConfig) GetListenAddress() string {
-	if m != nil {
-		return m.ListenAddress
-	}
-	return ""
-}
-
-func (m *HttpsConfig) GetCertificate() string {
-	if m != nil {
-		return m.Certificate
-	}
-	return ""
-}
-
-func (m *HttpsConfig) GetKey() string {
-	if m != nil {
-		return m.Key
-	}
-	return ""
-}
-
-func (m *HttpsConfig) GetStreaming() bool {
-	if m != nil {
-		return m.Streaming
-	}
-	return false
-}
-
-func init() {
-	proto.RegisterType((*Plugin)(nil), "fleetspeak.plugins.Plugin")
-	proto.RegisterType((*Config)(nil), "fleetspeak.plugins.Config")
-	proto.RegisterType((*HttpsConfig)(nil), "fleetspeak.plugins.HttpsConfig")
-}
-
-func init() {
-	proto.RegisterFile("fleetspeak/src/server/plugins/proto/plugins/config.proto", fileDescriptor0)
-}
-
-var fileDescriptor0 = []byte{
-	// 361 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x4d, 0x4b, 0xf3, 0x40,
-	0x10, 0xc7, 0x69, 0xd3, 0x27, 0x4f, 0x3b, 0xe9, 0xd3, 0x47, 0xf6, 0x20, 0x8b, 0x78, 0xa8, 0x05,
-	0xc1, 0x53, 0x02, 0x0a, 0x52, 0x3c, 0x08, 0x52, 0x10, 0x4f, 0x22, 0xbd, 0x78, 0x0c, 0xeb, 0x76,
-	0xd2, 0x2e, 0x4d, 0xb2, 0x61, 0x77, 0x2a, 0xd4, 0x0f, 0xe0, 0x67, 0xf2, 0xe3, 0x49, 0x36, 0xdb,
-	0x17, 0xf1, 0x90, 0xdb, 0xec, 0x7f, 0xfe, 0xbf, 0x79, 0x49, 0x06, 0xa6, 0x59, 0x8e, 0x48, 0xb6,
-	0x42, 0xb1, 0x4e, 0xac, 0x91, 0x89, 0x45, 0xf3, 0x8e, 0x26, 0xa9, 0xf2, 0xcd, 0x52, 0x95, 0x36,
-	0xa9, 0x8c, 0x26, 0xbd, 0x7f, 0x49, 0x5d, 0x66, 0x6a, 0x19, 0x3b, 0x91, 0xb1, 0x03, 0x19, 0x7b,
-	0xc3, 0xe4, 0x15, 0xc2, 0x17, 0x17, 0x32, 0x06, 0xbd, 0x4a, 0xd0, 0x8a, 0x77, 0xc6, 0x9d, 0xab,
-	0xc1, 0xdc, 0xc5, 0xec, 0x02, 0x86, 0x99, 0x90, 0xa4, 0xcd, 0x36, 0x2d, 0x45, 0x81, 0xbc, 0xeb,
-	0x72, 0x91, 0xd7, 0x9e, 0x45, 0x81, 0xec, 0x14, 0xc2, 0xa6, 0x09, 0x0f, 0x5c, 0xd2, 0xbf, 0x26,
-	0x5f, 0x01, 0x84, 0x33, 0x17, 0xb2, 0x29, 0x0c, 0x16, 0x82, 0x84, 0x25, 0x6d, 0xd0, 0x95, 0x8f,
-	0xae, 0xcf, 0xe2, 0xdf, 0xb3, 0xc4, 0xcd, 0x20, 0xf3, 0x83, 0x99, 0xcd, 0xe0, 0x7f, 0xbd, 0x9e,
-	0x92, 0x98, 0xfa, 0x9e, 0xbc, 0x3b, 0x0e, 0x5a, 0xf8, 0x91, 0x47, 0x1e, 0x1b, 0x82, 0xdd, 0xc3,
-	0x50, 0xea, 0xa2, 0xd8, 0x94, 0x4a, 0x0a, 0xd2, 0x86, 0x07, 0xad, 0x15, 0x7e, 0xf8, 0xdd, 0x10,
-	0x24, 0xc8, 0xa6, 0x52, 0xe7, 0x39, 0xd6, 0x35, 0x79, 0xaf, 0x75, 0x89, 0x91, 0x43, 0x66, 0x3b,
-	0x82, 0xdd, 0x01, 0x88, 0x0d, 0xad, 0xb4, 0x51, 0x1f, 0x68, 0xf8, 0x9f, 0x56, 0xfe, 0xc8, 0xcd,
-	0x6e, 0xa1, 0x5f, 0x6a, 0x52, 0x99, 0x42, 0xc3, 0xc3, 0x56, 0x72, 0xef, 0xad, 0xb9, 0x5c, 0x59,
-	0xc2, 0x12, 0x0d, 0xff, 0xdb, 0xce, 0xed, 0xbc, 0x93, 0xcf, 0x0e, 0x44, 0x4f, 0x44, 0x95, 0xf5,
-	0xff, 0xef, 0x12, 0x46, 0x4d, 0x2e, 0x15, 0x8b, 0x85, 0x41, 0x6b, 0xfd, 0x8d, 0xfc, 0x6b, 0xd4,
-	0x87, 0x46, 0x64, 0x63, 0x88, 0x24, 0x9a, 0xba, 0xb7, 0x14, 0xb4, 0xbf, 0x95, 0x23, 0x89, 0x9d,
-	0x40, 0xb0, 0xc6, 0xad, 0x3f, 0x94, 0x3a, 0x64, 0xe7, 0x30, 0xb0, 0x64, 0x50, 0x14, 0xaa, 0x5c,
-	0xba, 0xaf, 0xda, 0x9f, 0x1f, 0x84, 0xb7, 0xd0, 0xdd, 0xed, 0xcd, 0x77, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0xf0, 0xe4, 0x09, 0xa8, 0xf3, 0x02, 0x00, 0x00,
-}
diff --git a/fleetspeak/src/server/plugins/proto/plugins/config.proto b/fleetspeak/src/server/plugins/proto/plugins/config.proto
deleted file mode 100644
index 2101736d..00000000
--- a/fleetspeak/src/server/plugins/proto/plugins/config.proto
+++ /dev/null
@@ -1,41 +0,0 @@
-syntax = "proto3";
-
-package fleetspeak.plugins;
-
-// A Plugin message describes how to instantiate a FS component from a go plugin
-// file, as defined by go's plugin library: https://golang.org/pkg/plugin/
-message Plugin {
-  // The full path to the plugin file containing this component.
-  string path = 1;
-
-  // The name of a factory function exported by the file. It will be passed the
-  // config string and must be one of the *Factory types defined in the
-  // Fleetspeak server.plugins package.
-  string factory_name = 2;
-  string config = 3;
-}
-
-message Config {
-  Plugin datastore = 1;  // Required
-  repeated Plugin service_factory = 2;
-  repeated Plugin communicator = 3;
-  Plugin stats_collector = 4;
-  Plugin authorizer = 5;
-  Plugin notifier = 6;
-  Plugin listener = 7;
-}
-
-message HttpsConfig {
-  // The bind address to listen for connections on, e.g. ":443" or "localhost:1234".
-  string listen_address = 1;
-
-  // A certificate chain which identifies the server to clients. x509 format.
-  string certificate = 2;
-
-  // The private key used to identify the server. Must match the first entry in
-  // certificates. x509 format.
-  string key = 3;
-
-  // If set includes support for streaming connections to clients.
-  bool streaming = 4;
-}
diff --git a/fleetspeak/src/server/plugins/sqlite/sqlite.go b/fleetspeak/src/server/plugins/sqlite/sqlite.go
deleted file mode 100644
index 84a294fd..00000000
--- a/fleetspeak/src/server/plugins/sqlite/sqlite.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2018 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package main contains a plugin which provides an sqlite based datastore.
-package main
-
-import (
-	log "github.com/golang/glog"
-
-	"github.com/google/fleetspeak/fleetspeak/src/server/db"
-	"github.com/google/fleetspeak/fleetspeak/src/server/sqlite"
-)
-
-// Factory is a plugins.DatabaseFactory which returns an sqlite based
-// database. Its configuration string should be a filename to open or create as
-// an sqlite3 database.
-func Factory(file string) (db.Store, error) {
-	return sqlite.MakeDatastore(file)
-}
-
-func main() {
-	log.Exitf("unimplemented")
-}
diff --git a/fleetspeak/src/server/proto/fleetspeak_server/admin.pb.go b/fleetspeak/src/server/proto/fleetspeak_server/admin.pb.go
index 28a7f10e..f85b4c9f 100644
--- a/fleetspeak/src/server/proto/fleetspeak_server/admin.pb.go
+++ b/fleetspeak/src/server/proto/fleetspeak_server/admin.pb.go
@@ -1,41 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: fleetspeak/src/server/proto/fleetspeak_server/admin.proto
 
-/*
-Package fleetspeak_server is a generated protocol buffer package.
-
-It is generated from these files:
-	fleetspeak/src/server/proto/fleetspeak_server/admin.proto
-	fleetspeak/src/server/proto/fleetspeak_server/broadcasts.proto
-	fleetspeak/src/server/proto/fleetspeak_server/resource.proto
-	fleetspeak/src/server/proto/fleetspeak_server/server.proto
-	fleetspeak/src/server/proto/fleetspeak_server/services.proto
-
-It has these top-level messages:
-	CreateBroadcastRequest
-	ListActiveBroadcastsRequest
-	ListActiveBroadcastsResponse
-	ListClientsRequest
-	ListClientsResponse
-	Client
-	GetMessageStatusRequest
-	GetMessageStatusResponse
-	StoreFileRequest
-	ListClientContactsRequest
-	ListClientContactsResponse
-	ClientContact
-	BlacklistClientRequest
-	Broadcast
-	ClientResourceUsageRecord
-	ServerConfig
-	ServiceConfig
-*/
 package fleetspeak_server
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/timestamp"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import fleetspeak "github.com/google/fleetspeak/fleetspeak/src/common/proto/fleetspeak"
 
 import (
@@ -55,14 +26,36 @@ var _ = math.Inf
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type CreateBroadcastRequest struct {
-	Broadcast *Broadcast `protobuf:"bytes,1,opt,name=broadcast" json:"broadcast,omitempty"`
-	Limit     uint64     `protobuf:"varint,2,opt,name=limit" json:"limit,omitempty"`
+	Broadcast            *Broadcast `protobuf:"bytes,1,opt,name=broadcast,proto3" json:"broadcast,omitempty"`
+	Limit                uint64     `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
 }
 
-func (m *CreateBroadcastRequest) Reset()                    { *m = CreateBroadcastRequest{} }
-func (m *CreateBroadcastRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateBroadcastRequest) ProtoMessage()               {}
-func (*CreateBroadcastRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *CreateBroadcastRequest) Reset()         { *m = CreateBroadcastRequest{} }
+func (m *CreateBroadcastRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateBroadcastRequest) ProtoMessage()    {}
+func (*CreateBroadcastRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_admin_c09957b67d2b7cd3, []int{0}
+}
+func (m *CreateBroadcastRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateBroadcastRequest.Unmarshal(m, b)
+}
+func (m *CreateBroadcastRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateBroadcastRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateBroadcastRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateBroadcastRequest.Merge(dst, src)
+}
+func (m *CreateBroadcastRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateBroadcastRequest.Size(m)
+}
+func (m *CreateBroadcastRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateBroadcastRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateBroadcastRequest proto.InternalMessageInfo
 
 func (m *CreateBroadcastRequest) GetBroadcast() *Broadcast {
 	if m != nil {
@@ -80,13 +73,35 @@ func (m *CreateBroadcastRequest) GetLimit() uint64 {
 
 type ListActiveBroadcastsRequest struct {
 	// If set, only return broadcasts with the given service_name.
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName          string   `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListActiveBroadcastsRequest) Reset()         { *m = ListActiveBroadcastsRequest{} }
+func (m *ListActiveBroadcastsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListActiveBroadcastsRequest) ProtoMessage()    {}
+func (*ListActiveBroadcastsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_admin_c09957b67d2b7cd3, []int{1}
+}
+func (m *ListActiveBroadcastsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListActiveBroadcastsRequest.Unmarshal(m, b)
+}
+func (m *ListActiveBroadcastsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListActiveBroadcastsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListActiveBroadcastsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListActiveBroadcastsRequest.Merge(dst, src)
+}
+func (m *ListActiveBroadcastsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListActiveBroadcastsRequest.Size(m)
+}
+func (m *ListActiveBroadcastsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListActiveBroadcastsRequest.DiscardUnknown(m)
 }
 
-func (m *ListActiveBroadcastsRequest) Reset()                    { *m = ListActiveBroadcastsRequest{} }
-func (m *ListActiveBroadcastsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListActiveBroadcastsRequest) ProtoMessage()               {}
-func (*ListActiveBroadcastsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_ListActiveBroadcastsRequest proto.InternalMessageInfo
 
 func (m *ListActiveBroadcastsRequest) GetServiceName() string {
 	if m != nil {
@@ -96,13 +111,35 @@ func (m *ListActiveBroadcastsRequest) GetServiceName() string {
 }
 
 type ListActiveBroadcastsResponse struct {
-	Broadcasts []*Broadcast `protobuf:"bytes,1,rep,name=broadcasts" json:"broadcasts,omitempty"`
+	Broadcasts           []*Broadcast `protobuf:"bytes,1,rep,name=broadcasts,proto3" json:"broadcasts,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *ListActiveBroadcastsResponse) Reset()         { *m = ListActiveBroadcastsResponse{} }
+func (m *ListActiveBroadcastsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListActiveBroadcastsResponse) ProtoMessage()    {}
+func (*ListActiveBroadcastsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_admin_c09957b67d2b7cd3, []int{2}
+}
+func (m *ListActiveBroadcastsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListActiveBroadcastsResponse.Unmarshal(m, b)
+}
+func (m *ListActiveBroadcastsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListActiveBroadcastsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListActiveBroadcastsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListActiveBroadcastsResponse.Merge(dst, src)
+}
+func (m *ListActiveBroadcastsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListActiveBroadcastsResponse.Size(m)
+}
+func (m *ListActiveBroadcastsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListActiveBroadcastsResponse.DiscardUnknown(m)
 }
 
-func (m *ListActiveBroadcastsResponse) Reset()                    { *m = ListActiveBroadcastsResponse{} }
-func (m *ListActiveBroadcastsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListActiveBroadcastsResponse) ProtoMessage()               {}
-func (*ListActiveBroadcastsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_ListActiveBroadcastsResponse proto.InternalMessageInfo
 
 func (m *ListActiveBroadcastsResponse) GetBroadcasts() []*Broadcast {
 	if m != nil {
@@ -114,13 +151,35 @@ func (m *ListActiveBroadcastsResponse) GetBroadcasts() []*Broadcast {
 type ListClientsRequest struct {
 	// If non-empty, restricts results to the listed client_ids. If empty, all
 	// clients known to the system will be listed.
-	ClientIds [][]byte `protobuf:"bytes,1,rep,name=client_ids,json=clientIds,proto3" json:"client_ids,omitempty"`
+	ClientIds            [][]byte `protobuf:"bytes,1,rep,name=client_ids,json=clientIds,proto3" json:"client_ids,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListClientsRequest) Reset()                    { *m = ListClientsRequest{} }
-func (m *ListClientsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListClientsRequest) ProtoMessage()               {}
-func (*ListClientsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *ListClientsRequest) Reset()         { *m = ListClientsRequest{} }
+func (m *ListClientsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListClientsRequest) ProtoMessage()    {}
+func (*ListClientsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_admin_c09957b67d2b7cd3, []int{3}
+}
+func (m *ListClientsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListClientsRequest.Unmarshal(m, b)
+}
+func (m *ListClientsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListClientsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListClientsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClientsRequest.Merge(dst, src)
+}
+func (m *ListClientsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListClientsRequest.Size(m)
+}
+func (m *ListClientsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListClientsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListClientsRequest proto.InternalMessageInfo
 
 func (m *ListClientsRequest) GetClientIds() [][]byte {
 	if m != nil {
@@ -130,13 +189,35 @@ func (m *ListClientsRequest) GetClientIds() [][]byte {
 }
 
 type ListClientsResponse struct {
-	Clients []*Client `protobuf:"bytes,1,rep,name=clients" json:"clients,omitempty"`
+	Clients              []*Client `protobuf:"bytes,1,rep,name=clients,proto3" json:"clients,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *ListClientsResponse) Reset()         { *m = ListClientsResponse{} }
+func (m *ListClientsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListClientsResponse) ProtoMessage()    {}
+func (*ListClientsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_admin_c09957b67d2b7cd3, []int{4}
+}
+func (m *ListClientsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListClientsResponse.Unmarshal(m, b)
+}
+func (m *ListClientsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListClientsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListClientsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClientsResponse.Merge(dst, src)
+}
+func (m *ListClientsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListClientsResponse.Size(m)
+}
+func (m *ListClientsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListClientsResponse.DiscardUnknown(m)
 }
 
-func (m *ListClientsResponse) Reset()                    { *m = ListClientsResponse{} }
-func (m *ListClientsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListClientsResponse) ProtoMessage()               {}
-func (*ListClientsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_ListClientsResponse proto.InternalMessageInfo
 
 func (m *ListClientsResponse) GetClients() []*Client {
 	if m != nil {
@@ -146,19 +227,41 @@ func (m *ListClientsResponse) GetClients() []*Client {
 }
 
 type Client struct {
-	ClientId               []byte                     `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
-	Labels                 []*fleetspeak.Label        `protobuf:"bytes,2,rep,name=labels" json:"labels,omitempty"`
-	LastContactTime        *google_protobuf.Timestamp `protobuf:"bytes,3,opt,name=last_contact_time,json=lastContactTime" json:"last_contact_time,omitempty"`
-	LastContactAddress     string                     `protobuf:"bytes,4,opt,name=last_contact_address,json=lastContactAddress" json:"last_contact_address,omitempty"`
-	LastContactStreamingTo string                     `protobuf:"bytes,7,opt,name=last_contact_streaming_to,json=lastContactStreamingTo" json:"last_contact_streaming_to,omitempty"`
-	LastClock              *google_protobuf.Timestamp `protobuf:"bytes,5,opt,name=last_clock,json=lastClock" json:"last_clock,omitempty"`
-	Blacklisted            bool                       `protobuf:"varint,6,opt,name=blacklisted" json:"blacklisted,omitempty"`
+	ClientId               []byte               `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
+	Labels                 []*fleetspeak.Label  `protobuf:"bytes,2,rep,name=labels,proto3" json:"labels,omitempty"`
+	LastContactTime        *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_contact_time,json=lastContactTime,proto3" json:"last_contact_time,omitempty"`
+	LastContactAddress     string               `protobuf:"bytes,4,opt,name=last_contact_address,json=lastContactAddress,proto3" json:"last_contact_address,omitempty"`
+	LastContactStreamingTo string               `protobuf:"bytes,7,opt,name=last_contact_streaming_to,json=lastContactStreamingTo,proto3" json:"last_contact_streaming_to,omitempty"`
+	LastClock              *timestamp.Timestamp `protobuf:"bytes,5,opt,name=last_clock,json=lastClock,proto3" json:"last_clock,omitempty"`
+	Blacklisted            bool                 `protobuf:"varint,6,opt,name=blacklisted,proto3" json:"blacklisted,omitempty"`
+	XXX_NoUnkeyedLiteral   struct{}             `json:"-"`
+	XXX_unrecognized       []byte               `json:"-"`
+	XXX_sizecache          int32                `json:"-"`
 }
 
-func (m *Client) Reset()                    { *m = Client{} }
-func (m *Client) String() string            { return proto.CompactTextString(m) }
-func (*Client) ProtoMessage()               {}
-func (*Client) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *Client) Reset()         { *m = Client{} }
+func (m *Client) String() string { return proto.CompactTextString(m) }
+func (*Client) ProtoMessage()    {}
+func (*Client) Descriptor() ([]byte, []int) {
+	return fileDescriptor_admin_c09957b67d2b7cd3, []int{5}
+}
+func (m *Client) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Client.Unmarshal(m, b)
+}
+func (m *Client) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Client.Marshal(b, m, deterministic)
+}
+func (dst *Client) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Client.Merge(dst, src)
+}
+func (m *Client) XXX_Size() int {
+	return xxx_messageInfo_Client.Size(m)
+}
+func (m *Client) XXX_DiscardUnknown() {
+	xxx_messageInfo_Client.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Client proto.InternalMessageInfo
 
 func (m *Client) GetClientId() []byte {
 	if m != nil {
@@ -174,7 +277,7 @@ func (m *Client) GetLabels() []*fleetspeak.Label {
 	return nil
 }
 
-func (m *Client) GetLastContactTime() *google_protobuf.Timestamp {
+func (m *Client) GetLastContactTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.LastContactTime
 	}
@@ -195,7 +298,7 @@ func (m *Client) GetLastContactStreamingTo() string {
 	return ""
 }
 
-func (m *Client) GetLastClock() *google_protobuf.Timestamp {
+func (m *Client) GetLastClock() *timestamp.Timestamp {
 	if m != nil {
 		return m.LastClock
 	}
@@ -210,13 +313,35 @@ func (m *Client) GetBlacklisted() bool {
 }
 
 type GetMessageStatusRequest struct {
-	MessageId []byte `protobuf:"bytes,1,opt,name=message_id,json=messageId,proto3" json:"message_id,omitempty"`
+	MessageId            []byte   `protobuf:"bytes,1,opt,name=message_id,json=messageId,proto3" json:"message_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetMessageStatusRequest) Reset()                    { *m = GetMessageStatusRequest{} }
-func (m *GetMessageStatusRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetMessageStatusRequest) ProtoMessage()               {}
-func (*GetMessageStatusRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *GetMessageStatusRequest) Reset()         { *m = GetMessageStatusRequest{} }
+func (m *GetMessageStatusRequest) String() string { return proto.CompactTextString(m) }
+func (*GetMessageStatusRequest) ProtoMessage()    {}
+func (*GetMessageStatusRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_admin_c09957b67d2b7cd3, []int{6}
+}
+func (m *GetMessageStatusRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetMessageStatusRequest.Unmarshal(m, b)
+}
+func (m *GetMessageStatusRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetMessageStatusRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetMessageStatusRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetMessageStatusRequest.Merge(dst, src)
+}
+func (m *GetMessageStatusRequest) XXX_Size() int {
+	return xxx_messageInfo_GetMessageStatusRequest.Size(m)
+}
+func (m *GetMessageStatusRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetMessageStatusRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetMessageStatusRequest proto.InternalMessageInfo
 
 func (m *GetMessageStatusRequest) GetMessageId() []byte {
 	if m != nil {
@@ -226,16 +351,38 @@ func (m *GetMessageStatusRequest) GetMessageId() []byte {
 }
 
 type GetMessageStatusResponse struct {
-	CreationTime *google_protobuf.Timestamp `protobuf:"bytes,1,opt,name=creation_time,json=creationTime" json:"creation_time,omitempty"`
-	Result       *fleetspeak.MessageResult  `protobuf:"bytes,2,opt,name=result" json:"result,omitempty"`
+	CreationTime         *timestamp.Timestamp      `protobuf:"bytes,1,opt,name=creation_time,json=creationTime,proto3" json:"creation_time,omitempty"`
+	Result               *fleetspeak.MessageResult `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
+}
+
+func (m *GetMessageStatusResponse) Reset()         { *m = GetMessageStatusResponse{} }
+func (m *GetMessageStatusResponse) String() string { return proto.CompactTextString(m) }
+func (*GetMessageStatusResponse) ProtoMessage()    {}
+func (*GetMessageStatusResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_admin_c09957b67d2b7cd3, []int{7}
+}
+func (m *GetMessageStatusResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetMessageStatusResponse.Unmarshal(m, b)
+}
+func (m *GetMessageStatusResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetMessageStatusResponse.Marshal(b, m, deterministic)
+}
+func (dst *GetMessageStatusResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetMessageStatusResponse.Merge(dst, src)
+}
+func (m *GetMessageStatusResponse) XXX_Size() int {
+	return xxx_messageInfo_GetMessageStatusResponse.Size(m)
+}
+func (m *GetMessageStatusResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetMessageStatusResponse.DiscardUnknown(m)
 }
 
-func (m *GetMessageStatusResponse) Reset()                    { *m = GetMessageStatusResponse{} }
-func (m *GetMessageStatusResponse) String() string            { return proto.CompactTextString(m) }
-func (*GetMessageStatusResponse) ProtoMessage()               {}
-func (*GetMessageStatusResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_GetMessageStatusResponse proto.InternalMessageInfo
 
-func (m *GetMessageStatusResponse) GetCreationTime() *google_protobuf.Timestamp {
+func (m *GetMessageStatusResponse) GetCreationTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreationTime
 	}
@@ -250,15 +397,37 @@ func (m *GetMessageStatusResponse) GetResult() *fleetspeak.MessageResult {
 }
 
 type StoreFileRequest struct {
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
-	FileName    string `protobuf:"bytes,2,opt,name=file_name,json=fileName" json:"file_name,omitempty"`
-	Data        []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
+	ServiceName          string   `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
+	FileName             string   `protobuf:"bytes,2,opt,name=file_name,json=fileName,proto3" json:"file_name,omitempty"`
+	Data                 []byte   `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *StoreFileRequest) Reset()                    { *m = StoreFileRequest{} }
-func (m *StoreFileRequest) String() string            { return proto.CompactTextString(m) }
-func (*StoreFileRequest) ProtoMessage()               {}
-func (*StoreFileRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *StoreFileRequest) Reset()         { *m = StoreFileRequest{} }
+func (m *StoreFileRequest) String() string { return proto.CompactTextString(m) }
+func (*StoreFileRequest) ProtoMessage()    {}
+func (*StoreFileRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_admin_c09957b67d2b7cd3, []int{8}
+}
+func (m *StoreFileRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StoreFileRequest.Unmarshal(m, b)
+}
+func (m *StoreFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StoreFileRequest.Marshal(b, m, deterministic)
+}
+func (dst *StoreFileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StoreFileRequest.Merge(dst, src)
+}
+func (m *StoreFileRequest) XXX_Size() int {
+	return xxx_messageInfo_StoreFileRequest.Size(m)
+}
+func (m *StoreFileRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StoreFileRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StoreFileRequest proto.InternalMessageInfo
 
 func (m *StoreFileRequest) GetServiceName() string {
 	if m != nil {
@@ -282,13 +451,35 @@ func (m *StoreFileRequest) GetData() []byte {
 }
 
 type ListClientContactsRequest struct {
-	ClientId []byte `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
+	ClientId             []byte   `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListClientContactsRequest) Reset()         { *m = ListClientContactsRequest{} }
+func (m *ListClientContactsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListClientContactsRequest) ProtoMessage()    {}
+func (*ListClientContactsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_admin_c09957b67d2b7cd3, []int{9}
+}
+func (m *ListClientContactsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListClientContactsRequest.Unmarshal(m, b)
+}
+func (m *ListClientContactsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListClientContactsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListClientContactsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClientContactsRequest.Merge(dst, src)
+}
+func (m *ListClientContactsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListClientContactsRequest.Size(m)
+}
+func (m *ListClientContactsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListClientContactsRequest.DiscardUnknown(m)
 }
 
-func (m *ListClientContactsRequest) Reset()                    { *m = ListClientContactsRequest{} }
-func (m *ListClientContactsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListClientContactsRequest) ProtoMessage()               {}
-func (*ListClientContactsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_ListClientContactsRequest proto.InternalMessageInfo
 
 func (m *ListClientContactsRequest) GetClientId() []byte {
 	if m != nil {
@@ -298,13 +489,35 @@ func (m *ListClientContactsRequest) GetClientId() []byte {
 }
 
 type ListClientContactsResponse struct {
-	Contacts []*ClientContact `protobuf:"bytes,1,rep,name=contacts" json:"contacts,omitempty"`
+	Contacts             []*ClientContact `protobuf:"bytes,1,rep,name=contacts,proto3" json:"contacts,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
 }
 
-func (m *ListClientContactsResponse) Reset()                    { *m = ListClientContactsResponse{} }
-func (m *ListClientContactsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListClientContactsResponse) ProtoMessage()               {}
-func (*ListClientContactsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *ListClientContactsResponse) Reset()         { *m = ListClientContactsResponse{} }
+func (m *ListClientContactsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListClientContactsResponse) ProtoMessage()    {}
+func (*ListClientContactsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_admin_c09957b67d2b7cd3, []int{10}
+}
+func (m *ListClientContactsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListClientContactsResponse.Unmarshal(m, b)
+}
+func (m *ListClientContactsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListClientContactsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListClientContactsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClientContactsResponse.Merge(dst, src)
+}
+func (m *ListClientContactsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListClientContactsResponse.Size(m)
+}
+func (m *ListClientContactsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListClientContactsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListClientContactsResponse proto.InternalMessageInfo
 
 func (m *ListClientContactsResponse) GetContacts() []*ClientContact {
 	if m != nil {
@@ -314,16 +527,38 @@ func (m *ListClientContactsResponse) GetContacts() []*ClientContact {
 }
 
 type ClientContact struct {
-	SentNonce       uint64                     `protobuf:"fixed64,1,opt,name=sent_nonce,json=sentNonce" json:"sent_nonce,omitempty"`
-	ReceivedNonce   uint64                     `protobuf:"fixed64,2,opt,name=received_nonce,json=receivedNonce" json:"received_nonce,omitempty"`
-	ObservedAddress string                     `protobuf:"bytes,3,opt,name=observed_address,json=observedAddress" json:"observed_address,omitempty"`
-	Timestamp       *google_protobuf.Timestamp `protobuf:"bytes,4,opt,name=timestamp" json:"timestamp,omitempty"`
+	SentNonce            uint64               `protobuf:"fixed64,1,opt,name=sent_nonce,json=sentNonce,proto3" json:"sent_nonce,omitempty"`
+	ReceivedNonce        uint64               `protobuf:"fixed64,2,opt,name=received_nonce,json=receivedNonce,proto3" json:"received_nonce,omitempty"`
+	ObservedAddress      string               `protobuf:"bytes,3,opt,name=observed_address,json=observedAddress,proto3" json:"observed_address,omitempty"`
+	Timestamp            *timestamp.Timestamp `protobuf:"bytes,4,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *ClientContact) Reset()                    { *m = ClientContact{} }
-func (m *ClientContact) String() string            { return proto.CompactTextString(m) }
-func (*ClientContact) ProtoMessage()               {}
-func (*ClientContact) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *ClientContact) Reset()         { *m = ClientContact{} }
+func (m *ClientContact) String() string { return proto.CompactTextString(m) }
+func (*ClientContact) ProtoMessage()    {}
+func (*ClientContact) Descriptor() ([]byte, []int) {
+	return fileDescriptor_admin_c09957b67d2b7cd3, []int{11}
+}
+func (m *ClientContact) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClientContact.Unmarshal(m, b)
+}
+func (m *ClientContact) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClientContact.Marshal(b, m, deterministic)
+}
+func (dst *ClientContact) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientContact.Merge(dst, src)
+}
+func (m *ClientContact) XXX_Size() int {
+	return xxx_messageInfo_ClientContact.Size(m)
+}
+func (m *ClientContact) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClientContact.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClientContact proto.InternalMessageInfo
 
 func (m *ClientContact) GetSentNonce() uint64 {
 	if m != nil {
@@ -346,7 +581,7 @@ func (m *ClientContact) GetObservedAddress() string {
 	return ""
 }
 
-func (m *ClientContact) GetTimestamp() *google_protobuf.Timestamp {
+func (m *ClientContact) GetTimestamp() *timestamp.Timestamp {
 	if m != nil {
 		return m.Timestamp
 	}
@@ -354,13 +589,35 @@ func (m *ClientContact) GetTimestamp() *google_protobuf.Timestamp {
 }
 
 type BlacklistClientRequest struct {
-	ClientId []byte `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
+	ClientId             []byte   `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *BlacklistClientRequest) Reset()                    { *m = BlacklistClientRequest{} }
-func (m *BlacklistClientRequest) String() string            { return proto.CompactTextString(m) }
-func (*BlacklistClientRequest) ProtoMessage()               {}
-func (*BlacklistClientRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *BlacklistClientRequest) Reset()         { *m = BlacklistClientRequest{} }
+func (m *BlacklistClientRequest) String() string { return proto.CompactTextString(m) }
+func (*BlacklistClientRequest) ProtoMessage()    {}
+func (*BlacklistClientRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_admin_c09957b67d2b7cd3, []int{12}
+}
+func (m *BlacklistClientRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BlacklistClientRequest.Unmarshal(m, b)
+}
+func (m *BlacklistClientRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BlacklistClientRequest.Marshal(b, m, deterministic)
+}
+func (dst *BlacklistClientRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BlacklistClientRequest.Merge(dst, src)
+}
+func (m *BlacklistClientRequest) XXX_Size() int {
+	return xxx_messageInfo_BlacklistClientRequest.Size(m)
+}
+func (m *BlacklistClientRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BlacklistClientRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BlacklistClientRequest proto.InternalMessageInfo
 
 func (m *BlacklistClientRequest) GetClientId() []byte {
 	if m != nil {
@@ -393,8 +650,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Admin service
-
+// AdminClient is the client API for Admin service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type AdminClient interface {
 	// CreateBroadcast creates a FS broadcast, potentially sending a message to
 	// many machines in the fleet.
@@ -431,7 +689,7 @@ func NewAdminClient(cc *grpc.ClientConn) AdminClient {
 
 func (c *adminClient) CreateBroadcast(ctx context.Context, in *CreateBroadcastRequest, opts ...grpc.CallOption) (*fleetspeak.EmptyMessage, error) {
 	out := new(fleetspeak.EmptyMessage)
-	err := grpc.Invoke(ctx, "/fleetspeak.server.Admin/CreateBroadcast", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/fleetspeak.server.Admin/CreateBroadcast", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -440,7 +698,7 @@ func (c *adminClient) CreateBroadcast(ctx context.Context, in *CreateBroadcastRe
 
 func (c *adminClient) ListActiveBroadcasts(ctx context.Context, in *ListActiveBroadcastsRequest, opts ...grpc.CallOption) (*ListActiveBroadcastsResponse, error) {
 	out := new(ListActiveBroadcastsResponse)
-	err := grpc.Invoke(ctx, "/fleetspeak.server.Admin/ListActiveBroadcasts", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/fleetspeak.server.Admin/ListActiveBroadcasts", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -449,7 +707,7 @@ func (c *adminClient) ListActiveBroadcasts(ctx context.Context, in *ListActiveBr
 
 func (c *adminClient) ListClients(ctx context.Context, in *ListClientsRequest, opts ...grpc.CallOption) (*ListClientsResponse, error) {
 	out := new(ListClientsResponse)
-	err := grpc.Invoke(ctx, "/fleetspeak.server.Admin/ListClients", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/fleetspeak.server.Admin/ListClients", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -458,7 +716,7 @@ func (c *adminClient) ListClients(ctx context.Context, in *ListClientsRequest, o
 
 func (c *adminClient) ListClientContacts(ctx context.Context, in *ListClientContactsRequest, opts ...grpc.CallOption) (*ListClientContactsResponse, error) {
 	out := new(ListClientContactsResponse)
-	err := grpc.Invoke(ctx, "/fleetspeak.server.Admin/ListClientContacts", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/fleetspeak.server.Admin/ListClientContacts", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -467,7 +725,7 @@ func (c *adminClient) ListClientContacts(ctx context.Context, in *ListClientCont
 
 func (c *adminClient) GetMessageStatus(ctx context.Context, in *GetMessageStatusRequest, opts ...grpc.CallOption) (*GetMessageStatusResponse, error) {
 	out := new(GetMessageStatusResponse)
-	err := grpc.Invoke(ctx, "/fleetspeak.server.Admin/GetMessageStatus", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/fleetspeak.server.Admin/GetMessageStatus", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -476,7 +734,7 @@ func (c *adminClient) GetMessageStatus(ctx context.Context, in *GetMessageStatus
 
 func (c *adminClient) InsertMessage(ctx context.Context, in *fleetspeak.Message, opts ...grpc.CallOption) (*fleetspeak.EmptyMessage, error) {
 	out := new(fleetspeak.EmptyMessage)
-	err := grpc.Invoke(ctx, "/fleetspeak.server.Admin/InsertMessage", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/fleetspeak.server.Admin/InsertMessage", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -485,7 +743,7 @@ func (c *adminClient) InsertMessage(ctx context.Context, in *fleetspeak.Message,
 
 func (c *adminClient) StoreFile(ctx context.Context, in *StoreFileRequest, opts ...grpc.CallOption) (*fleetspeak.EmptyMessage, error) {
 	out := new(fleetspeak.EmptyMessage)
-	err := grpc.Invoke(ctx, "/fleetspeak.server.Admin/StoreFile", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/fleetspeak.server.Admin/StoreFile", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -494,7 +752,7 @@ func (c *adminClient) StoreFile(ctx context.Context, in *StoreFileRequest, opts
 
 func (c *adminClient) KeepAlive(ctx context.Context, in *fleetspeak.EmptyMessage, opts ...grpc.CallOption) (*fleetspeak.EmptyMessage, error) {
 	out := new(fleetspeak.EmptyMessage)
-	err := grpc.Invoke(ctx, "/fleetspeak.server.Admin/KeepAlive", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/fleetspeak.server.Admin/KeepAlive", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -503,15 +761,14 @@ func (c *adminClient) KeepAlive(ctx context.Context, in *fleetspeak.EmptyMessage
 
 func (c *adminClient) BlacklistClient(ctx context.Context, in *BlacklistClientRequest, opts ...grpc.CallOption) (*fleetspeak.EmptyMessage, error) {
 	out := new(fleetspeak.EmptyMessage)
-	err := grpc.Invoke(ctx, "/fleetspeak.server.Admin/BlacklistClient", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/fleetspeak.server.Admin/BlacklistClient", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Admin service
-
+// AdminServer is the server API for Admin service.
 type AdminServer interface {
 	// CreateBroadcast creates a FS broadcast, potentially sending a message to
 	// many machines in the fleet.
@@ -750,10 +1007,10 @@ var _Admin_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/server/proto/fleetspeak_server/admin.proto", fileDescriptor0)
+	proto.RegisterFile("fleetspeak/src/server/proto/fleetspeak_server/admin.proto", fileDescriptor_admin_c09957b67d2b7cd3)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_admin_c09957b67d2b7cd3 = []byte{
 	// 859 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xed, 0x6e, 0xe3, 0x54,
 	0x10, 0x5d, 0xa7, 0x6d, 0xb6, 0x9e, 0xa6, 0xb4, 0xbd, 0x5b, 0x15, 0xd7, 0xbb, 0x88, 0x60, 0xb4,
diff --git a/fleetspeak/src/server/proto/fleetspeak_server/broadcasts.pb.go b/fleetspeak/src/server/proto/fleetspeak_server/broadcasts.pb.go
index 7ebbb910..96b73ad4 100644
--- a/fleetspeak/src/server/proto/fleetspeak_server/broadcasts.pb.go
+++ b/fleetspeak/src/server/proto/fleetspeak_server/broadcasts.pb.go
@@ -6,8 +6,8 @@ package fleetspeak_server
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/any"
-import google_protobuf "github.com/golang/protobuf/ptypes/timestamp"
+import any "github.com/golang/protobuf/ptypes/any"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import fleetspeak "github.com/google/fleetspeak/fleetspeak/src/common/proto/fleetspeak"
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -15,26 +15,54 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
 // A Broadcast is a template to build messages to send to a number of machines.
 type Broadcast struct {
 	BroadcastId []byte `protobuf:"bytes,1,opt,name=broadcast_id,json=broadcastId,proto3" json:"broadcast_id,omitempty"`
 	// The source of the broadcast, it should only be a server side service. The
 	// destinations for the resulting broadcast messages will be different clients
 	// with the same service name.
-	Source      *fleetspeak.Address `protobuf:"bytes,2,opt,name=source" json:"source,omitempty"`
-	MessageType string              `protobuf:"bytes,3,opt,name=message_type,json=messageType" json:"message_type,omitempty"`
+	Source      *fleetspeak.Address `protobuf:"bytes,2,opt,name=source,proto3" json:"source,omitempty"`
+	MessageType string              `protobuf:"bytes,3,opt,name=message_type,json=messageType,proto3" json:"message_type,omitempty"`
 	// A client will only be sent this broadcast if it has been marked with all of
 	// the required labels.
-	RequiredLabels []*fleetspeak.Label `protobuf:"bytes,4,rep,name=required_labels,json=requiredLabels" json:"required_labels,omitempty"`
+	RequiredLabels []*fleetspeak.Label `protobuf:"bytes,4,rep,name=required_labels,json=requiredLabels,proto3" json:"required_labels,omitempty"`
 	// A broadcast will stop being sent at this time.
-	ExpirationTime *google_protobuf.Timestamp `protobuf:"bytes,5,opt,name=expiration_time,json=expirationTime" json:"expiration_time,omitempty"`
-	Data           *google_protobuf1.Any      `protobuf:"bytes,6,opt,name=data" json:"data,omitempty"`
+	ExpirationTime       *timestamp.Timestamp `protobuf:"bytes,5,opt,name=expiration_time,json=expirationTime,proto3" json:"expiration_time,omitempty"`
+	Data                 *any.Any             `protobuf:"bytes,6,opt,name=data,proto3" json:"data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *Broadcast) Reset()         { *m = Broadcast{} }
+func (m *Broadcast) String() string { return proto.CompactTextString(m) }
+func (*Broadcast) ProtoMessage()    {}
+func (*Broadcast) Descriptor() ([]byte, []int) {
+	return fileDescriptor_broadcasts_83a60435fcad98b2, []int{0}
+}
+func (m *Broadcast) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Broadcast.Unmarshal(m, b)
+}
+func (m *Broadcast) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Broadcast.Marshal(b, m, deterministic)
+}
+func (dst *Broadcast) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Broadcast.Merge(dst, src)
+}
+func (m *Broadcast) XXX_Size() int {
+	return xxx_messageInfo_Broadcast.Size(m)
+}
+func (m *Broadcast) XXX_DiscardUnknown() {
+	xxx_messageInfo_Broadcast.DiscardUnknown(m)
 }
 
-func (m *Broadcast) Reset()                    { *m = Broadcast{} }
-func (m *Broadcast) String() string            { return proto.CompactTextString(m) }
-func (*Broadcast) ProtoMessage()               {}
-func (*Broadcast) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_Broadcast proto.InternalMessageInfo
 
 func (m *Broadcast) GetBroadcastId() []byte {
 	if m != nil {
@@ -64,14 +92,14 @@ func (m *Broadcast) GetRequiredLabels() []*fleetspeak.Label {
 	return nil
 }
 
-func (m *Broadcast) GetExpirationTime() *google_protobuf.Timestamp {
+func (m *Broadcast) GetExpirationTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ExpirationTime
 	}
 	return nil
 }
 
-func (m *Broadcast) GetData() *google_protobuf1.Any {
+func (m *Broadcast) GetData() *any.Any {
 	if m != nil {
 		return m.Data
 	}
@@ -83,10 +111,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/server/proto/fleetspeak_server/broadcasts.proto", fileDescriptor1)
+	proto.RegisterFile("fleetspeak/src/server/proto/fleetspeak_server/broadcasts.proto", fileDescriptor_broadcasts_83a60435fcad98b2)
 }
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_broadcasts_83a60435fcad98b2 = []byte{
 	// 301 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0xc1, 0x6b, 0xc2, 0x30,
 	0x18, 0xc5, 0xa9, 0x3a, 0xc1, 0x54, 0x14, 0xbb, 0x1d, 0x32, 0x2f, 0xeb, 0x76, 0x2a, 0x0c, 0x52,
diff --git a/fleetspeak/src/server/proto/fleetspeak_server/resource.pb.go b/fleetspeak/src/server/proto/fleetspeak_server/resource.pb.go
index 58370521..b87391c4 100644
--- a/fleetspeak/src/server/proto/fleetspeak_server/resource.pb.go
+++ b/fleetspeak/src/server/proto/fleetspeak_server/resource.pb.go
@@ -6,42 +6,70 @@ package fleetspeak_server
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/timestamp"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
 // Represents client resource-usage data in the data-store.
 // Next id: 13
 type ClientResourceUsageRecord struct {
 	// Name of the client service that resource usage is charged/attributed to
 	// e.g 'system' for the system Fleetspeak service, or the name of a daemon
 	// service as specified in its config.
-	Scope            string                     `protobuf:"bytes,1,opt,name=scope" json:"scope,omitempty"`
-	Pid              int64                      `protobuf:"varint,2,opt,name=pid" json:"pid,omitempty"`
-	ProcessStartTime *google_protobuf.Timestamp `protobuf:"bytes,3,opt,name=process_start_time,json=processStartTime" json:"process_start_time,omitempty"`
+	Scope            string               `protobuf:"bytes,1,opt,name=scope,proto3" json:"scope,omitempty"`
+	Pid              int64                `protobuf:"varint,2,opt,name=pid,proto3" json:"pid,omitempty"`
+	ProcessStartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=process_start_time,json=processStartTime,proto3" json:"process_start_time,omitempty"`
 	// When the resource-usage metrics were measured on the client.
-	ClientTimestamp *google_protobuf.Timestamp `protobuf:"bytes,4,opt,name=client_timestamp,json=clientTimestamp" json:"client_timestamp,omitempty"`
+	ClientTimestamp *timestamp.Timestamp `protobuf:"bytes,4,opt,name=client_timestamp,json=clientTimestamp,proto3" json:"client_timestamp,omitempty"`
 	// When the resource usage record was written to the data-store.
-	ServerTimestamp *google_protobuf.Timestamp `protobuf:"bytes,5,opt,name=server_timestamp,json=serverTimestamp" json:"server_timestamp,omitempty"`
+	ServerTimestamp *timestamp.Timestamp `protobuf:"bytes,5,opt,name=server_timestamp,json=serverTimestamp,proto3" json:"server_timestamp,omitempty"`
 	// If true, indicates that the process has terminated, and that this is
 	// the final resource-usage record for that process.
-	ProcessTerminated bool `protobuf:"varint,12,opt,name=process_terminated,json=processTerminated" json:"process_terminated,omitempty"`
+	ProcessTerminated bool `protobuf:"varint,12,opt,name=process_terminated,json=processTerminated,proto3" json:"process_terminated,omitempty"`
 	// CPU-usage is in millis per second.
-	MeanUserCpuRate       float32 `protobuf:"fixed32,6,opt,name=mean_user_cpu_rate,json=meanUserCpuRate" json:"mean_user_cpu_rate,omitempty"`
-	MaxUserCpuRate        float32 `protobuf:"fixed32,7,opt,name=max_user_cpu_rate,json=maxUserCpuRate" json:"max_user_cpu_rate,omitempty"`
-	MeanSystemCpuRate     float32 `protobuf:"fixed32,8,opt,name=mean_system_cpu_rate,json=meanSystemCpuRate" json:"mean_system_cpu_rate,omitempty"`
-	MaxSystemCpuRate      float32 `protobuf:"fixed32,9,opt,name=max_system_cpu_rate,json=maxSystemCpuRate" json:"max_system_cpu_rate,omitempty"`
-	MeanResidentMemoryMib int32   `protobuf:"varint,10,opt,name=mean_resident_memory_mib,json=meanResidentMemoryMib" json:"mean_resident_memory_mib,omitempty"`
-	MaxResidentMemoryMib  int32   `protobuf:"varint,11,opt,name=max_resident_memory_mib,json=maxResidentMemoryMib" json:"max_resident_memory_mib,omitempty"`
+	MeanUserCpuRate       float32  `protobuf:"fixed32,6,opt,name=mean_user_cpu_rate,json=meanUserCpuRate,proto3" json:"mean_user_cpu_rate,omitempty"`
+	MaxUserCpuRate        float32  `protobuf:"fixed32,7,opt,name=max_user_cpu_rate,json=maxUserCpuRate,proto3" json:"max_user_cpu_rate,omitempty"`
+	MeanSystemCpuRate     float32  `protobuf:"fixed32,8,opt,name=mean_system_cpu_rate,json=meanSystemCpuRate,proto3" json:"mean_system_cpu_rate,omitempty"`
+	MaxSystemCpuRate      float32  `protobuf:"fixed32,9,opt,name=max_system_cpu_rate,json=maxSystemCpuRate,proto3" json:"max_system_cpu_rate,omitempty"`
+	MeanResidentMemoryMib int32    `protobuf:"varint,10,opt,name=mean_resident_memory_mib,json=meanResidentMemoryMib,proto3" json:"mean_resident_memory_mib,omitempty"`
+	MaxResidentMemoryMib  int32    `protobuf:"varint,11,opt,name=max_resident_memory_mib,json=maxResidentMemoryMib,proto3" json:"max_resident_memory_mib,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{} `json:"-"`
+	XXX_unrecognized      []byte   `json:"-"`
+	XXX_sizecache         int32    `json:"-"`
+}
+
+func (m *ClientResourceUsageRecord) Reset()         { *m = ClientResourceUsageRecord{} }
+func (m *ClientResourceUsageRecord) String() string { return proto.CompactTextString(m) }
+func (*ClientResourceUsageRecord) ProtoMessage()    {}
+func (*ClientResourceUsageRecord) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resource_add51730b8e324e1, []int{0}
+}
+func (m *ClientResourceUsageRecord) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClientResourceUsageRecord.Unmarshal(m, b)
+}
+func (m *ClientResourceUsageRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClientResourceUsageRecord.Marshal(b, m, deterministic)
+}
+func (dst *ClientResourceUsageRecord) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientResourceUsageRecord.Merge(dst, src)
+}
+func (m *ClientResourceUsageRecord) XXX_Size() int {
+	return xxx_messageInfo_ClientResourceUsageRecord.Size(m)
+}
+func (m *ClientResourceUsageRecord) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClientResourceUsageRecord.DiscardUnknown(m)
 }
 
-func (m *ClientResourceUsageRecord) Reset()                    { *m = ClientResourceUsageRecord{} }
-func (m *ClientResourceUsageRecord) String() string            { return proto.CompactTextString(m) }
-func (*ClientResourceUsageRecord) ProtoMessage()               {}
-func (*ClientResourceUsageRecord) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+var xxx_messageInfo_ClientResourceUsageRecord proto.InternalMessageInfo
 
 func (m *ClientResourceUsageRecord) GetScope() string {
 	if m != nil {
@@ -57,21 +85,21 @@ func (m *ClientResourceUsageRecord) GetPid() int64 {
 	return 0
 }
 
-func (m *ClientResourceUsageRecord) GetProcessStartTime() *google_protobuf.Timestamp {
+func (m *ClientResourceUsageRecord) GetProcessStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ProcessStartTime
 	}
 	return nil
 }
 
-func (m *ClientResourceUsageRecord) GetClientTimestamp() *google_protobuf.Timestamp {
+func (m *ClientResourceUsageRecord) GetClientTimestamp() *timestamp.Timestamp {
 	if m != nil {
 		return m.ClientTimestamp
 	}
 	return nil
 }
 
-func (m *ClientResourceUsageRecord) GetServerTimestamp() *google_protobuf.Timestamp {
+func (m *ClientResourceUsageRecord) GetServerTimestamp() *timestamp.Timestamp {
 	if m != nil {
 		return m.ServerTimestamp
 	}
@@ -132,10 +160,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/server/proto/fleetspeak_server/resource.proto", fileDescriptor2)
+	proto.RegisterFile("fleetspeak/src/server/proto/fleetspeak_server/resource.proto", fileDescriptor_resource_add51730b8e324e1)
 }
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_resource_add51730b8e324e1 = []byte{
 	// 393 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0xc1, 0x8e, 0xd3, 0x30,
 	0x10, 0x86, 0x95, 0xed, 0x76, 0xd9, 0xf5, 0x22, 0x36, 0x31, 0x45, 0x98, 0x5e, 0x88, 0x38, 0x05,
diff --git a/fleetspeak/src/server/proto/fleetspeak_server/server.pb.go b/fleetspeak/src/server/proto/fleetspeak_server/server.pb.go
index a4b63328..b74fb753 100644
--- a/fleetspeak/src/server/proto/fleetspeak_server/server.pb.go
+++ b/fleetspeak/src/server/proto/fleetspeak_server/server.pb.go
@@ -6,28 +6,56 @@ package fleetspeak_server
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/duration"
+import duration "github.com/golang/protobuf/ptypes/duration"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
 // Describes a server's configuration. If unset, all values default to values
 // reasonable for a unit test or small installation. Larger installations may
 // need to tune these.
 type ServerConfig struct {
 	// The collection of services that this server should include.
-	Services []*ServiceConfig `protobuf:"bytes,1,rep,name=services" json:"services,omitempty"`
+	Services []*ServiceConfig `protobuf:"bytes,1,rep,name=services,proto3" json:"services,omitempty"`
 	// The approximate time to wait between checking for new broadcasts. If unset,
 	// a default of 1 minute is used.
-	BroadcastPollTime *google_protobuf2.Duration `protobuf:"bytes,2,opt,name=broadcast_poll_time,json=broadcastPollTime" json:"broadcast_poll_time,omitempty"`
+	BroadcastPollTime    *duration.Duration `protobuf:"bytes,2,opt,name=broadcast_poll_time,json=broadcastPollTime,proto3" json:"broadcast_poll_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *ServerConfig) Reset()         { *m = ServerConfig{} }
+func (m *ServerConfig) String() string { return proto.CompactTextString(m) }
+func (*ServerConfig) ProtoMessage()    {}
+func (*ServerConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_server_2271f3b4a5c265fb, []int{0}
+}
+func (m *ServerConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServerConfig.Unmarshal(m, b)
+}
+func (m *ServerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServerConfig.Marshal(b, m, deterministic)
+}
+func (dst *ServerConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerConfig.Merge(dst, src)
+}
+func (m *ServerConfig) XXX_Size() int {
+	return xxx_messageInfo_ServerConfig.Size(m)
+}
+func (m *ServerConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServerConfig.DiscardUnknown(m)
 }
 
-func (m *ServerConfig) Reset()                    { *m = ServerConfig{} }
-func (m *ServerConfig) String() string            { return proto.CompactTextString(m) }
-func (*ServerConfig) ProtoMessage()               {}
-func (*ServerConfig) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+var xxx_messageInfo_ServerConfig proto.InternalMessageInfo
 
 func (m *ServerConfig) GetServices() []*ServiceConfig {
 	if m != nil {
@@ -36,7 +64,7 @@ func (m *ServerConfig) GetServices() []*ServiceConfig {
 	return nil
 }
 
-func (m *ServerConfig) GetBroadcastPollTime() *google_protobuf2.Duration {
+func (m *ServerConfig) GetBroadcastPollTime() *duration.Duration {
 	if m != nil {
 		return m.BroadcastPollTime
 	}
@@ -48,10 +76,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/server/proto/fleetspeak_server/server.proto", fileDescriptor3)
+	proto.RegisterFile("fleetspeak/src/server/proto/fleetspeak_server/server.proto", fileDescriptor_server_2271f3b4a5c265fb)
 }
 
-var fileDescriptor3 = []byte{
+var fileDescriptor_server_2271f3b4a5c265fb = []byte{
 	// 204 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4a, 0xcb, 0x49, 0x4d,
 	0x2d, 0x29, 0x2e, 0x48, 0x4d, 0xcc, 0xd6, 0x2f, 0x2e, 0x4a, 0xd6, 0x2f, 0x4e, 0x2d, 0x2a, 0x4b,
diff --git a/fleetspeak/src/server/proto/fleetspeak_server/services.pb.go b/fleetspeak/src/server/proto/fleetspeak_server/services.pb.go
index 6391ebb6..6bb45c0f 100644
--- a/fleetspeak/src/server/proto/fleetspeak_server/services.pb.go
+++ b/fleetspeak/src/server/proto/fleetspeak_server/services.pb.go
@@ -6,34 +6,62 @@ package fleetspeak_server
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/any"
+import any "github.com/golang/protobuf/ptypes/any"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
 // A ServiceConfig describes how the server should configure a 'service', which is
 // a module that sends and processes messages.
 type ServiceConfig struct {
 	// The name that the service will be known as. Primary use is to address
 	// messages to the service. The service names 'server' and 'client' are
 	// reserved.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The name of the factory which will be used to generate the service.
-	Factory string `protobuf:"bytes,2,opt,name=factory" json:"factory,omitempty"`
+	Factory string `protobuf:"bytes,2,opt,name=factory,proto3" json:"factory,omitempty"`
 	// The maximum number of simultaneous calls to the service's ProcessMessage
 	// method. If unset, defaults to 100.
-	MaxParallelism uint32 `protobuf:"varint,3,opt,name=max_parallelism,json=maxParallelism" json:"max_parallelism,omitempty"`
+	MaxParallelism uint32 `protobuf:"varint,3,opt,name=max_parallelism,json=maxParallelism,proto3" json:"max_parallelism,omitempty"`
 	// Additional configuration information for the factory to use when setting up
 	// the service. The allowed type depends upon the factory.
-	Config *google_protobuf1.Any `protobuf:"bytes,4,opt,name=config" json:"config,omitempty"`
+	Config               *any.Any `protobuf:"bytes,4,opt,name=config,proto3" json:"config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ServiceConfig) Reset()         { *m = ServiceConfig{} }
+func (m *ServiceConfig) String() string { return proto.CompactTextString(m) }
+func (*ServiceConfig) ProtoMessage()    {}
+func (*ServiceConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_services_9d67e677149c20ee, []int{0}
+}
+func (m *ServiceConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServiceConfig.Unmarshal(m, b)
+}
+func (m *ServiceConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServiceConfig.Marshal(b, m, deterministic)
+}
+func (dst *ServiceConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServiceConfig.Merge(dst, src)
+}
+func (m *ServiceConfig) XXX_Size() int {
+	return xxx_messageInfo_ServiceConfig.Size(m)
+}
+func (m *ServiceConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServiceConfig.DiscardUnknown(m)
 }
 
-func (m *ServiceConfig) Reset()                    { *m = ServiceConfig{} }
-func (m *ServiceConfig) String() string            { return proto.CompactTextString(m) }
-func (*ServiceConfig) ProtoMessage()               {}
-func (*ServiceConfig) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
+var xxx_messageInfo_ServiceConfig proto.InternalMessageInfo
 
 func (m *ServiceConfig) GetName() string {
 	if m != nil {
@@ -56,7 +84,7 @@ func (m *ServiceConfig) GetMaxParallelism() uint32 {
 	return 0
 }
 
-func (m *ServiceConfig) GetConfig() *google_protobuf1.Any {
+func (m *ServiceConfig) GetConfig() *any.Any {
 	if m != nil {
 		return m.Config
 	}
@@ -68,10 +96,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("fleetspeak/src/server/proto/fleetspeak_server/services.proto", fileDescriptor4)
+	proto.RegisterFile("fleetspeak/src/server/proto/fleetspeak_server/services.proto", fileDescriptor_services_9d67e677149c20ee)
 }
 
-var fileDescriptor4 = []byte{
+var fileDescriptor_services_9d67e677149c20ee = []byte{
 	// 206 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0x8e, 0x4f, 0x4a, 0xc7, 0x30,
 	0x10, 0x85, 0x89, 0x96, 0x8a, 0x91, 0x2a, 0x06, 0x17, 0xd1, 0x55, 0x71, 0x63, 0x17, 0x92, 0x80,
diff --git a/fleetspeak/src/server/server/server.go b/fleetspeak/src/server/server/server.go
index dfec14f8..449e4caf 100644
--- a/fleetspeak/src/server/server/server.go
+++ b/fleetspeak/src/server/server/server.go
@@ -26,14 +26,14 @@ import (
 	"github.com/golang/protobuf/proto"
 
 	"github.com/google/fleetspeak/fleetspeak/src/server"
-	"github.com/google/fleetspeak/fleetspeak/src/server/plugins"
+	"github.com/google/fleetspeak/fleetspeak/src/server/components"
 
-	ppb "github.com/google/fleetspeak/fleetspeak/src/server/plugins/proto/plugins"
+	cpb "github.com/google/fleetspeak/fleetspeak/src/server/components/proto/fleetspeak_components"
 	spb "github.com/google/fleetspeak/fleetspeak/src/server/proto/fleetspeak_server"
 )
 
-var pluginConfigPath = flag.String("plugin_config_path", "/etc/fleetspeak-server/plugins.config", "File describing the plugins to load.")
-var serverConfigPath = flag.String("server_config_path", "/etc/fleetspeak-server/server.config", "File describing the overal server configuration.")
+var componentConfigPath = flag.String("component_config_path", "/etc/fleetspeak-server/components.config", "File describing the server component configuration.")
+var serverConfigPath = flag.String("server_config_path", "/etc/fleetspeak-server/server.config", "File describing the overall server configuration.")
 
 func main() {
 	flag.Parse()
@@ -52,19 +52,19 @@ func main() {
 }
 
 func loadComponents() server.Components {
-	b, err := ioutil.ReadFile(*pluginConfigPath)
+	b, err := ioutil.ReadFile(*componentConfigPath)
 	if err != nil {
-		log.Exitf("Unable to read component config file [%s]: %v", *pluginConfigPath, err)
+		log.Exitf("Unable to read component config file [%s]: %v", *componentConfigPath, err)
 	}
-	var c ppb.Config
+	var c cpb.Config
 	if err := proto.UnmarshalText(string(b), &c); err != nil {
-		log.Exitf("Unable to parse component config file [%s]: %v", *pluginConfigPath, err)
+		log.Exitf("Unable to parse component config file [%s]: %v", *componentConfigPath, err)
 	}
-	r, err := plugins.Load(&c)
+	r, err := components.MakeComponents(c)
 	if err != nil {
 		log.Exitf("Failed to load components: %v", err)
 	}
-	return r
+	return *r
 }
 
 func readConfig() *spb.ServerConfig {