Protobuff changes