diff --git a/gen/dart/lib/services/tasks_svc/v1/patient_svc.pb.dart b/gen/dart/lib/services/tasks_svc/v1/patient_svc.pb.dart
index b9e075653..a7a90ecbc 100644
--- a/gen/dart/lib/services/tasks_svc/v1/patient_svc.pb.dart
+++ b/gen/dart/lib/services/tasks_svc/v1/patient_svc.pb.dart
@@ -2997,6 +2997,88 @@ class ReadmitPatientResponse extends $pb.GeneratedMessage {
   static ReadmitPatientResponse? _defaultInstance;
 }
 
+class DeletePatientRequest extends $pb.GeneratedMessage {
+  factory DeletePatientRequest({
+    $core.String? id,
+  }) {
+    final $result = create();
+    if (id != null) {
+      $result.id = id;
+    }
+    return $result;
+  }
+  DeletePatientRequest._() : super();
+  factory DeletePatientRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory DeletePatientRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeletePatientRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'id')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  DeletePatientRequest clone() => DeletePatientRequest()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  DeletePatientRequest copyWith(void Function(DeletePatientRequest) updates) => super.copyWith((message) => updates(message as DeletePatientRequest)) as DeletePatientRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static DeletePatientRequest create() => DeletePatientRequest._();
+  DeletePatientRequest createEmptyInstance() => create();
+  static $pb.PbList<DeletePatientRequest> createRepeated() => $pb.PbList<DeletePatientRequest>();
+  @$core.pragma('dart2js:noInline')
+  static DeletePatientRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<DeletePatientRequest>(create);
+  static DeletePatientRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get id => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set id($core.String v) { $_setString(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearId() => clearField(1);
+}
+
+class DeletePatientResponse extends $pb.GeneratedMessage {
+  factory DeletePatientResponse() => create();
+  DeletePatientResponse._() : super();
+  factory DeletePatientResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory DeletePatientResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeletePatientResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  DeletePatientResponse clone() => DeletePatientResponse()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  DeletePatientResponse copyWith(void Function(DeletePatientResponse) updates) => super.copyWith((message) => updates(message as DeletePatientResponse)) as DeletePatientResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static DeletePatientResponse create() => DeletePatientResponse._();
+  DeletePatientResponse createEmptyInstance() => create();
+  static $pb.PbList<DeletePatientResponse> createRepeated() => $pb.PbList<DeletePatientResponse>();
+  @$core.pragma('dart2js:noInline')
+  static DeletePatientResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<DeletePatientResponse>(create);
+  static DeletePatientResponse? _defaultInstance;
+}
+
 
 const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
 const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/gen/dart/lib/services/tasks_svc/v1/patient_svc.pbgrpc.dart b/gen/dart/lib/services/tasks_svc/v1/patient_svc.pbgrpc.dart
index ef32bdd2e..592913c1c 100644
--- a/gen/dart/lib/services/tasks_svc/v1/patient_svc.pbgrpc.dart
+++ b/gen/dart/lib/services/tasks_svc/v1/patient_svc.pbgrpc.dart
@@ -73,6 +73,10 @@ class PatientServiceClient extends $grpc.Client {
       '/services.tasks_svc.v1.PatientService/ReadmitPatient',
       ($13.ReadmitPatientRequest value) => value.writeToBuffer(),
       ($core.List<$core.int> value) => $13.ReadmitPatientResponse.fromBuffer(value));
+  static final _$deletePatient = $grpc.ClientMethod<$13.DeletePatientRequest, $13.DeletePatientResponse>(
+      '/services.tasks_svc.v1.PatientService/DeletePatient',
+      ($13.DeletePatientRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $13.DeletePatientResponse.fromBuffer(value));
 
   PatientServiceClient($grpc.ClientChannel channel,
       {$grpc.CallOptions? options,
@@ -131,6 +135,10 @@ class PatientServiceClient extends $grpc.Client {
   $grpc.ResponseFuture<$13.ReadmitPatientResponse> readmitPatient($13.ReadmitPatientRequest request, {$grpc.CallOptions? options}) {
     return $createUnaryCall(_$readmitPatient, request, options: options);
   }
+
+  $grpc.ResponseFuture<$13.DeletePatientResponse> deletePatient($13.DeletePatientRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$deletePatient, request, options: options);
+  }
 }
 
 @$pb.GrpcServiceName('services.tasks_svc.v1.PatientService')
@@ -229,6 +237,13 @@ abstract class PatientServiceBase extends $grpc.Service {
         false,
         ($core.List<$core.int> value) => $13.ReadmitPatientRequest.fromBuffer(value),
         ($13.ReadmitPatientResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$13.DeletePatientRequest, $13.DeletePatientResponse>(
+        'DeletePatient',
+        deletePatient_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $13.DeletePatientRequest.fromBuffer(value),
+        ($13.DeletePatientResponse value) => value.writeToBuffer()));
   }
 
   $async.Future<$13.CreatePatientResponse> createPatient_Pre($grpc.ServiceCall call, $async.Future<$13.CreatePatientRequest> request) async {
@@ -283,6 +298,10 @@ abstract class PatientServiceBase extends $grpc.Service {
     return readmitPatient(call, await request);
   }
 
+  $async.Future<$13.DeletePatientResponse> deletePatient_Pre($grpc.ServiceCall call, $async.Future<$13.DeletePatientRequest> request) async {
+    return deletePatient(call, await request);
+  }
+
   $async.Future<$13.CreatePatientResponse> createPatient($grpc.ServiceCall call, $13.CreatePatientRequest request);
   $async.Future<$13.GetPatientResponse> getPatient($grpc.ServiceCall call, $13.GetPatientRequest request);
   $async.Future<$13.GetPatientByBedResponse> getPatientByBed($grpc.ServiceCall call, $13.GetPatientByBedRequest request);
@@ -296,4 +315,5 @@ abstract class PatientServiceBase extends $grpc.Service {
   $async.Future<$13.UnassignBedResponse> unassignBed($grpc.ServiceCall call, $13.UnassignBedRequest request);
   $async.Future<$13.DischargePatientResponse> dischargePatient($grpc.ServiceCall call, $13.DischargePatientRequest request);
   $async.Future<$13.ReadmitPatientResponse> readmitPatient($grpc.ServiceCall call, $13.ReadmitPatientRequest request);
+  $async.Future<$13.DeletePatientResponse> deletePatient($grpc.ServiceCall call, $13.DeletePatientRequest request);
 }
diff --git a/gen/dart/lib/services/tasks_svc/v1/patient_svc.pbjson.dart b/gen/dart/lib/services/tasks_svc/v1/patient_svc.pbjson.dart
index d50e0029e..0fd249bf8 100644
--- a/gen/dart/lib/services/tasks_svc/v1/patient_svc.pbjson.dart
+++ b/gen/dart/lib/services/tasks_svc/v1/patient_svc.pbjson.dart
@@ -639,3 +639,24 @@ const ReadmitPatientResponse$json = {
 final $typed_data.Uint8List readmitPatientResponseDescriptor = $convert.base64Decode(
     'ChZSZWFkbWl0UGF0aWVudFJlc3BvbnNl');
 
+@$core.Deprecated('Use deletePatientRequestDescriptor instead')
+const DeletePatientRequest$json = {
+  '1': 'DeletePatientRequest',
+  '2': [
+    {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
+  ],
+};
+
+/// Descriptor for `DeletePatientRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List deletePatientRequestDescriptor = $convert.base64Decode(
+    'ChREZWxldGVQYXRpZW50UmVxdWVzdBIOCgJpZBgBIAEoCVICaWQ=');
+
+@$core.Deprecated('Use deletePatientResponseDescriptor instead')
+const DeletePatientResponse$json = {
+  '1': 'DeletePatientResponse',
+};
+
+/// Descriptor for `DeletePatientResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List deletePatientResponseDescriptor = $convert.base64Decode(
+    'ChVEZWxldGVQYXRpZW50UmVzcG9uc2U=');
+
diff --git a/gen/dart/lib/services/tasks_svc/v1/room_svc.pb.dart b/gen/dart/lib/services/tasks_svc/v1/room_svc.pb.dart
index 6e3dd932c..7e45fd4a7 100644
--- a/gen/dart/lib/services/tasks_svc/v1/room_svc.pb.dart
+++ b/gen/dart/lib/services/tasks_svc/v1/room_svc.pb.dart
@@ -328,12 +328,21 @@ class GetRoomResponse extends $pb.GeneratedMessage {
 }
 
 class GetRoomsRequest extends $pb.GeneratedMessage {
-  factory GetRoomsRequest() => create();
+  factory GetRoomsRequest({
+    $core.String? wardId,
+  }) {
+    final $result = create();
+    if (wardId != null) {
+      $result.wardId = wardId;
+    }
+    return $result;
+  }
   GetRoomsRequest._() : super();
   factory GetRoomsRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
   factory GetRoomsRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetRoomsRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'wardId')
     ..hasRequiredFields = false
   ;
 
@@ -357,6 +366,15 @@ class GetRoomsRequest extends $pb.GeneratedMessage {
   @$core.pragma('dart2js:noInline')
   static GetRoomsRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetRoomsRequest>(create);
   static GetRoomsRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get wardId => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set wardId($core.String v) { $_setString(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasWardId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearWardId() => clearField(1);
 }
 
 class GetRoomsResponse_Room_Bed extends $pb.GeneratedMessage {
@@ -553,250 +571,6 @@ class GetRoomsResponse extends $pb.GeneratedMessage {
   $core.List<GetRoomsResponse_Room> get rooms => $_getList(0);
 }
 
-class GetRoomsByWardRequest extends $pb.GeneratedMessage {
-  factory GetRoomsByWardRequest({
-    $core.String? wardId,
-  }) {
-    final $result = create();
-    if (wardId != null) {
-      $result.wardId = wardId;
-    }
-    return $result;
-  }
-  GetRoomsByWardRequest._() : super();
-  factory GetRoomsByWardRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetRoomsByWardRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetRoomsByWardRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'wardId')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetRoomsByWardRequest clone() => GetRoomsByWardRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetRoomsByWardRequest copyWith(void Function(GetRoomsByWardRequest) updates) => super.copyWith((message) => updates(message as GetRoomsByWardRequest)) as GetRoomsByWardRequest;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static GetRoomsByWardRequest create() => GetRoomsByWardRequest._();
-  GetRoomsByWardRequest createEmptyInstance() => create();
-  static $pb.PbList<GetRoomsByWardRequest> createRepeated() => $pb.PbList<GetRoomsByWardRequest>();
-  @$core.pragma('dart2js:noInline')
-  static GetRoomsByWardRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetRoomsByWardRequest>(create);
-  static GetRoomsByWardRequest? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.String get wardId => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set wardId($core.String v) { $_setString(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasWardId() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearWardId() => clearField(1);
-}
-
-class GetRoomsByWardResponse_Room_Bed extends $pb.GeneratedMessage {
-  factory GetRoomsByWardResponse_Room_Bed({
-    $core.String? id,
-    $core.String? name,
-  }) {
-    final $result = create();
-    if (id != null) {
-      $result.id = id;
-    }
-    if (name != null) {
-      $result.name = name;
-    }
-    return $result;
-  }
-  GetRoomsByWardResponse_Room_Bed._() : super();
-  factory GetRoomsByWardResponse_Room_Bed.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetRoomsByWardResponse_Room_Bed.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetRoomsByWardResponse.Room.Bed', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'id')
-    ..aOS(2, _omitFieldNames ? '' : 'name')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetRoomsByWardResponse_Room_Bed clone() => GetRoomsByWardResponse_Room_Bed()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetRoomsByWardResponse_Room_Bed copyWith(void Function(GetRoomsByWardResponse_Room_Bed) updates) => super.copyWith((message) => updates(message as GetRoomsByWardResponse_Room_Bed)) as GetRoomsByWardResponse_Room_Bed;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static GetRoomsByWardResponse_Room_Bed create() => GetRoomsByWardResponse_Room_Bed._();
-  GetRoomsByWardResponse_Room_Bed createEmptyInstance() => create();
-  static $pb.PbList<GetRoomsByWardResponse_Room_Bed> createRepeated() => $pb.PbList<GetRoomsByWardResponse_Room_Bed>();
-  @$core.pragma('dart2js:noInline')
-  static GetRoomsByWardResponse_Room_Bed getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetRoomsByWardResponse_Room_Bed>(create);
-  static GetRoomsByWardResponse_Room_Bed? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.String get id => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set id($core.String v) { $_setString(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasId() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearId() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.String get name => $_getSZ(1);
-  @$pb.TagNumber(2)
-  set name($core.String v) { $_setString(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasName() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearName() => clearField(2);
-}
-
-class GetRoomsByWardResponse_Room extends $pb.GeneratedMessage {
-  factory GetRoomsByWardResponse_Room({
-    $core.String? id,
-    $core.String? name,
-    $core.Iterable<GetRoomsByWardResponse_Room_Bed>? beds,
-    $core.String? wardId,
-  }) {
-    final $result = create();
-    if (id != null) {
-      $result.id = id;
-    }
-    if (name != null) {
-      $result.name = name;
-    }
-    if (beds != null) {
-      $result.beds.addAll(beds);
-    }
-    if (wardId != null) {
-      $result.wardId = wardId;
-    }
-    return $result;
-  }
-  GetRoomsByWardResponse_Room._() : super();
-  factory GetRoomsByWardResponse_Room.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetRoomsByWardResponse_Room.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetRoomsByWardResponse.Room', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'id')
-    ..aOS(2, _omitFieldNames ? '' : 'name')
-    ..pc<GetRoomsByWardResponse_Room_Bed>(3, _omitFieldNames ? '' : 'beds', $pb.PbFieldType.PM, subBuilder: GetRoomsByWardResponse_Room_Bed.create)
-    ..aOS(5, _omitFieldNames ? '' : 'wardId')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetRoomsByWardResponse_Room clone() => GetRoomsByWardResponse_Room()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetRoomsByWardResponse_Room copyWith(void Function(GetRoomsByWardResponse_Room) updates) => super.copyWith((message) => updates(message as GetRoomsByWardResponse_Room)) as GetRoomsByWardResponse_Room;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static GetRoomsByWardResponse_Room create() => GetRoomsByWardResponse_Room._();
-  GetRoomsByWardResponse_Room createEmptyInstance() => create();
-  static $pb.PbList<GetRoomsByWardResponse_Room> createRepeated() => $pb.PbList<GetRoomsByWardResponse_Room>();
-  @$core.pragma('dart2js:noInline')
-  static GetRoomsByWardResponse_Room getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetRoomsByWardResponse_Room>(create);
-  static GetRoomsByWardResponse_Room? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.String get id => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set id($core.String v) { $_setString(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasId() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearId() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.String get name => $_getSZ(1);
-  @$pb.TagNumber(2)
-  set name($core.String v) { $_setString(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasName() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearName() => clearField(2);
-
-  @$pb.TagNumber(3)
-  $core.List<GetRoomsByWardResponse_Room_Bed> get beds => $_getList(2);
-
-  @$pb.TagNumber(5)
-  $core.String get wardId => $_getSZ(3);
-  @$pb.TagNumber(5)
-  set wardId($core.String v) { $_setString(3, v); }
-  @$pb.TagNumber(5)
-  $core.bool hasWardId() => $_has(3);
-  @$pb.TagNumber(5)
-  void clearWardId() => clearField(5);
-}
-
-class GetRoomsByWardResponse extends $pb.GeneratedMessage {
-  factory GetRoomsByWardResponse({
-    $core.Iterable<GetRoomsByWardResponse_Room>? rooms,
-  }) {
-    final $result = create();
-    if (rooms != null) {
-      $result.rooms.addAll(rooms);
-    }
-    return $result;
-  }
-  GetRoomsByWardResponse._() : super();
-  factory GetRoomsByWardResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetRoomsByWardResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetRoomsByWardResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
-    ..pc<GetRoomsByWardResponse_Room>(1, _omitFieldNames ? '' : 'rooms', $pb.PbFieldType.PM, subBuilder: GetRoomsByWardResponse_Room.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetRoomsByWardResponse clone() => GetRoomsByWardResponse()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetRoomsByWardResponse copyWith(void Function(GetRoomsByWardResponse) updates) => super.copyWith((message) => updates(message as GetRoomsByWardResponse)) as GetRoomsByWardResponse;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static GetRoomsByWardResponse create() => GetRoomsByWardResponse._();
-  GetRoomsByWardResponse createEmptyInstance() => create();
-  static $pb.PbList<GetRoomsByWardResponse> createRepeated() => $pb.PbList<GetRoomsByWardResponse>();
-  @$core.pragma('dart2js:noInline')
-  static GetRoomsByWardResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetRoomsByWardResponse>(create);
-  static GetRoomsByWardResponse? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.List<GetRoomsByWardResponse_Room> get rooms => $_getList(0);
-}
-
 class UpdateRoomRequest extends $pb.GeneratedMessage {
   factory UpdateRoomRequest({
     $core.String? id,
diff --git a/gen/dart/lib/services/tasks_svc/v1/room_svc.pbgrpc.dart b/gen/dart/lib/services/tasks_svc/v1/room_svc.pbgrpc.dart
index 8190d6b77..9b4d036a1 100644
--- a/gen/dart/lib/services/tasks_svc/v1/room_svc.pbgrpc.dart
+++ b/gen/dart/lib/services/tasks_svc/v1/room_svc.pbgrpc.dart
@@ -33,10 +33,6 @@ class RoomServiceClient extends $grpc.Client {
       '/services.tasks_svc.v1.RoomService/GetRooms',
       ($14.GetRoomsRequest value) => value.writeToBuffer(),
       ($core.List<$core.int> value) => $14.GetRoomsResponse.fromBuffer(value));
-  static final _$getRoomsByWard = $grpc.ClientMethod<$14.GetRoomsByWardRequest, $14.GetRoomsByWardResponse>(
-      '/services.tasks_svc.v1.RoomService/GetRoomsByWard',
-      ($14.GetRoomsByWardRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $14.GetRoomsByWardResponse.fromBuffer(value));
   static final _$updateRoom = $grpc.ClientMethod<$14.UpdateRoomRequest, $14.UpdateRoomResponse>(
       '/services.tasks_svc.v1.RoomService/UpdateRoom',
       ($14.UpdateRoomRequest value) => value.writeToBuffer(),
@@ -68,10 +64,6 @@ class RoomServiceClient extends $grpc.Client {
     return $createUnaryCall(_$getRooms, request, options: options);
   }
 
-  $grpc.ResponseFuture<$14.GetRoomsByWardResponse> getRoomsByWard($14.GetRoomsByWardRequest request, {$grpc.CallOptions? options}) {
-    return $createUnaryCall(_$getRoomsByWard, request, options: options);
-  }
-
   $grpc.ResponseFuture<$14.UpdateRoomResponse> updateRoom($14.UpdateRoomRequest request, {$grpc.CallOptions? options}) {
     return $createUnaryCall(_$updateRoom, request, options: options);
   }
@@ -111,13 +103,6 @@ abstract class RoomServiceBase extends $grpc.Service {
         false,
         ($core.List<$core.int> value) => $14.GetRoomsRequest.fromBuffer(value),
         ($14.GetRoomsResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$14.GetRoomsByWardRequest, $14.GetRoomsByWardResponse>(
-        'GetRoomsByWard',
-        getRoomsByWard_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $14.GetRoomsByWardRequest.fromBuffer(value),
-        ($14.GetRoomsByWardResponse value) => value.writeToBuffer()));
     $addMethod($grpc.ServiceMethod<$14.UpdateRoomRequest, $14.UpdateRoomResponse>(
         'UpdateRoom',
         updateRoom_Pre,
@@ -153,10 +138,6 @@ abstract class RoomServiceBase extends $grpc.Service {
     return getRooms(call, await request);
   }
 
-  $async.Future<$14.GetRoomsByWardResponse> getRoomsByWard_Pre($grpc.ServiceCall call, $async.Future<$14.GetRoomsByWardRequest> request) async {
-    return getRoomsByWard(call, await request);
-  }
-
   $async.Future<$14.UpdateRoomResponse> updateRoom_Pre($grpc.ServiceCall call, $async.Future<$14.UpdateRoomRequest> request) async {
     return updateRoom(call, await request);
   }
@@ -172,7 +153,6 @@ abstract class RoomServiceBase extends $grpc.Service {
   $async.Future<$14.CreateRoomResponse> createRoom($grpc.ServiceCall call, $14.CreateRoomRequest request);
   $async.Future<$14.GetRoomResponse> getRoom($grpc.ServiceCall call, $14.GetRoomRequest request);
   $async.Future<$14.GetRoomsResponse> getRooms($grpc.ServiceCall call, $14.GetRoomsRequest request);
-  $async.Future<$14.GetRoomsByWardResponse> getRoomsByWard($grpc.ServiceCall call, $14.GetRoomsByWardRequest request);
   $async.Future<$14.UpdateRoomResponse> updateRoom($grpc.ServiceCall call, $14.UpdateRoomRequest request);
   $async.Future<$14.DeleteRoomResponse> deleteRoom($grpc.ServiceCall call, $14.DeleteRoomRequest request);
   $async.Future<$14.GetRoomOverviewsByWardResponse> getRoomOverviewsByWard($grpc.ServiceCall call, $14.GetRoomOverviewsByWardRequest request);
diff --git a/gen/dart/lib/services/tasks_svc/v1/room_svc.pbjson.dart b/gen/dart/lib/services/tasks_svc/v1/room_svc.pbjson.dart
index dfa473a72..1342b861b 100644
--- a/gen/dart/lib/services/tasks_svc/v1/room_svc.pbjson.dart
+++ b/gen/dart/lib/services/tasks_svc/v1/room_svc.pbjson.dart
@@ -82,11 +82,18 @@ final $typed_data.Uint8List getRoomResponseDescriptor = $convert.base64Decode(
 @$core.Deprecated('Use getRoomsRequestDescriptor instead')
 const GetRoomsRequest$json = {
   '1': 'GetRoomsRequest',
+  '2': [
+    {'1': 'ward_id', '3': 1, '4': 1, '5': 9, '9': 0, '10': 'wardId', '17': true},
+  ],
+  '8': [
+    {'1': '_ward_id'},
+  ],
 };
 
 /// Descriptor for `GetRoomsRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List getRoomsRequestDescriptor = $convert.base64Decode(
-    'Cg9HZXRSb29tc1JlcXVlc3Q=');
+    'Cg9HZXRSb29tc1JlcXVlc3QSHAoHd2FyZF9pZBgBIAEoCUgAUgZ3YXJkSWSIAQFCCgoIX3dhcm'
+    'RfaWQ=');
 
 @$core.Deprecated('Use getRoomsResponseDescriptor instead')
 const GetRoomsResponse$json = {
@@ -126,57 +133,6 @@ final $typed_data.Uint8List getRoomsResponseDescriptor = $convert.base64Decode(
     '52MS5HZXRSb29tc1Jlc3BvbnNlLlJvb20uQmVkUgRiZWRzEhcKB3dhcmRfaWQYBSABKAlSBndh'
     'cmRJZBopCgNCZWQSDgoCaWQYASABKAlSAmlkEhIKBG5hbWUYAiABKAlSBG5hbWU=');
 
-@$core.Deprecated('Use getRoomsByWardRequestDescriptor instead')
-const GetRoomsByWardRequest$json = {
-  '1': 'GetRoomsByWardRequest',
-  '2': [
-    {'1': 'ward_id', '3': 1, '4': 1, '5': 9, '10': 'wardId'},
-  ],
-};
-
-/// Descriptor for `GetRoomsByWardRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getRoomsByWardRequestDescriptor = $convert.base64Decode(
-    'ChVHZXRSb29tc0J5V2FyZFJlcXVlc3QSFwoHd2FyZF9pZBgBIAEoCVIGd2FyZElk');
-
-@$core.Deprecated('Use getRoomsByWardResponseDescriptor instead')
-const GetRoomsByWardResponse$json = {
-  '1': 'GetRoomsByWardResponse',
-  '2': [
-    {'1': 'rooms', '3': 1, '4': 3, '5': 11, '6': '.services.tasks_svc.v1.GetRoomsByWardResponse.Room', '10': 'rooms'},
-  ],
-  '3': [GetRoomsByWardResponse_Room$json],
-};
-
-@$core.Deprecated('Use getRoomsByWardResponseDescriptor instead')
-const GetRoomsByWardResponse_Room$json = {
-  '1': 'Room',
-  '2': [
-    {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
-    {'1': 'name', '3': 2, '4': 1, '5': 9, '10': 'name'},
-    {'1': 'beds', '3': 3, '4': 3, '5': 11, '6': '.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed', '10': 'beds'},
-    {'1': 'ward_id', '3': 5, '4': 1, '5': 9, '10': 'wardId'},
-  ],
-  '3': [GetRoomsByWardResponse_Room_Bed$json],
-};
-
-@$core.Deprecated('Use getRoomsByWardResponseDescriptor instead')
-const GetRoomsByWardResponse_Room_Bed$json = {
-  '1': 'Bed',
-  '2': [
-    {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
-    {'1': 'name', '3': 2, '4': 1, '5': 9, '10': 'name'},
-  ],
-};
-
-/// Descriptor for `GetRoomsByWardResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getRoomsByWardResponseDescriptor = $convert.base64Decode(
-    'ChZHZXRSb29tc0J5V2FyZFJlc3BvbnNlEkgKBXJvb21zGAEgAygLMjIuc2VydmljZXMudGFza3'
-    'Nfc3ZjLnYxLkdldFJvb21zQnlXYXJkUmVzcG9uc2UuUm9vbVIFcm9vbXMaugEKBFJvb20SDgoC'
-    'aWQYASABKAlSAmlkEhIKBG5hbWUYAiABKAlSBG5hbWUSSgoEYmVkcxgDIAMoCzI2LnNlcnZpY2'
-    'VzLnRhc2tzX3N2Yy52MS5HZXRSb29tc0J5V2FyZFJlc3BvbnNlLlJvb20uQmVkUgRiZWRzEhcK'
-    'B3dhcmRfaWQYBSABKAlSBndhcmRJZBopCgNCZWQSDgoCaWQYASABKAlSAmlkEhIKBG5hbWUYAi'
-    'ABKAlSBG5hbWU=');
-
 @$core.Deprecated('Use updateRoomRequestDescriptor instead')
 const UpdateRoomRequest$json = {
   '1': 'UpdateRoomRequest',
diff --git a/gen/dart/lib/services/tasks_svc/v1/task_svc.pb.dart b/gen/dart/lib/services/tasks_svc/v1/task_svc.pb.dart
index 657fe760d..6747f98f5 100644
--- a/gen/dart/lib/services/tasks_svc/v1/task_svc.pb.dart
+++ b/gen/dart/lib/services/tasks_svc/v1/task_svc.pb.dart
@@ -16,6 +16,70 @@ import 'package:protobuf/protobuf.dart' as $pb;
 import '../../../google/protobuf/timestamp.pb.dart' as $20;
 import 'types.pbenum.dart' as $22;
 
+class CreateTaskRequest_SubTask extends $pb.GeneratedMessage {
+  factory CreateTaskRequest_SubTask({
+    $core.String? name,
+    $core.bool? done,
+  }) {
+    final $result = create();
+    if (name != null) {
+      $result.name = name;
+    }
+    if (done != null) {
+      $result.done = done;
+    }
+    return $result;
+  }
+  CreateTaskRequest_SubTask._() : super();
+  factory CreateTaskRequest_SubTask.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory CreateTaskRequest_SubTask.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateTaskRequest.SubTask', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'name')
+    ..aOB(2, _omitFieldNames ? '' : 'done')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  CreateTaskRequest_SubTask clone() => CreateTaskRequest_SubTask()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  CreateTaskRequest_SubTask copyWith(void Function(CreateTaskRequest_SubTask) updates) => super.copyWith((message) => updates(message as CreateTaskRequest_SubTask)) as CreateTaskRequest_SubTask;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static CreateTaskRequest_SubTask create() => CreateTaskRequest_SubTask._();
+  CreateTaskRequest_SubTask createEmptyInstance() => create();
+  static $pb.PbList<CreateTaskRequest_SubTask> createRepeated() => $pb.PbList<CreateTaskRequest_SubTask>();
+  @$core.pragma('dart2js:noInline')
+  static CreateTaskRequest_SubTask getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CreateTaskRequest_SubTask>(create);
+  static CreateTaskRequest_SubTask? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get name => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set name($core.String v) { $_setString(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasName() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearName() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.bool get done => $_getBF(1);
+  @$pb.TagNumber(2)
+  set done($core.bool v) { $_setBool(1, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasDone() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearDone() => clearField(2);
+}
+
 class CreateTaskRequest extends $pb.GeneratedMessage {
   factory CreateTaskRequest({
     $core.String? name,
@@ -24,6 +88,8 @@ class CreateTaskRequest extends $pb.GeneratedMessage {
     $core.bool? public,
     $20.Timestamp? dueAt,
     $22.TaskStatus? initialStatus,
+    $core.String? assignedUserId,
+    $core.Iterable<CreateTaskRequest_SubTask>? subtasks,
   }) {
     final $result = create();
     if (name != null) {
@@ -44,6 +110,12 @@ class CreateTaskRequest extends $pb.GeneratedMessage {
     if (initialStatus != null) {
       $result.initialStatus = initialStatus;
     }
+    if (assignedUserId != null) {
+      $result.assignedUserId = assignedUserId;
+    }
+    if (subtasks != null) {
+      $result.subtasks.addAll(subtasks);
+    }
     return $result;
   }
   CreateTaskRequest._() : super();
@@ -57,6 +129,8 @@ class CreateTaskRequest extends $pb.GeneratedMessage {
     ..aOB(4, _omitFieldNames ? '' : 'public')
     ..aOM<$20.Timestamp>(5, _omitFieldNames ? '' : 'dueAt', subBuilder: $20.Timestamp.create)
     ..e<$22.TaskStatus>(6, _omitFieldNames ? '' : 'initialStatus', $pb.PbFieldType.OE, defaultOrMaker: $22.TaskStatus.TASK_STATUS_UNSPECIFIED, valueOf: $22.TaskStatus.valueOf, enumValues: $22.TaskStatus.values)
+    ..aOS(7, _omitFieldNames ? '' : 'assignedUserId')
+    ..pc<CreateTaskRequest_SubTask>(8, _omitFieldNames ? '' : 'subtasks', $pb.PbFieldType.PM, subBuilder: CreateTaskRequest_SubTask.create)
     ..hasRequiredFields = false
   ;
 
@@ -136,6 +210,18 @@ class CreateTaskRequest extends $pb.GeneratedMessage {
   $core.bool hasInitialStatus() => $_has(5);
   @$pb.TagNumber(6)
   void clearInitialStatus() => clearField(6);
+
+  @$pb.TagNumber(7)
+  $core.String get assignedUserId => $_getSZ(6);
+  @$pb.TagNumber(7)
+  set assignedUserId($core.String v) { $_setString(6, v); }
+  @$pb.TagNumber(7)
+  $core.bool hasAssignedUserId() => $_has(6);
+  @$pb.TagNumber(7)
+  void clearAssignedUserId() => clearField(7);
+
+  @$pb.TagNumber(8)
+  $core.List<CreateTaskRequest_SubTask> get subtasks => $_getList(7);
 }
 
 class CreateTaskResponse extends $pb.GeneratedMessage {
@@ -195,6 +281,7 @@ class UpdateTaskRequest extends $pb.GeneratedMessage {
     $core.String? description,
     $20.Timestamp? dueAt,
     $22.TaskStatus? status,
+    $core.bool? public,
   }) {
     final $result = create();
     if (id != null) {
@@ -212,6 +299,9 @@ class UpdateTaskRequest extends $pb.GeneratedMessage {
     if (status != null) {
       $result.status = status;
     }
+    if (public != null) {
+      $result.public = public;
+    }
     return $result;
   }
   UpdateTaskRequest._() : super();
@@ -224,6 +314,7 @@ class UpdateTaskRequest extends $pb.GeneratedMessage {
     ..aOS(3, _omitFieldNames ? '' : 'description')
     ..aOM<$20.Timestamp>(4, _omitFieldNames ? '' : 'dueAt', subBuilder: $20.Timestamp.create)
     ..e<$22.TaskStatus>(5, _omitFieldNames ? '' : 'status', $pb.PbFieldType.OE, defaultOrMaker: $22.TaskStatus.TASK_STATUS_UNSPECIFIED, valueOf: $22.TaskStatus.valueOf, enumValues: $22.TaskStatus.values)
+    ..aOB(6, _omitFieldNames ? '' : 'public')
     ..hasRequiredFields = false
   ;
 
@@ -294,6 +385,15 @@ class UpdateTaskRequest extends $pb.GeneratedMessage {
   $core.bool hasStatus() => $_has(4);
   @$pb.TagNumber(5)
   void clearStatus() => clearField(5);
+
+  @$pb.TagNumber(6)
+  $core.bool get public => $_getBF(5);
+  @$pb.TagNumber(6)
+  set public($core.bool v) { $_setBool(5, v); }
+  @$pb.TagNumber(6)
+  $core.bool hasPublic() => $_has(5);
+  @$pb.TagNumber(6)
+  void clearPublic() => clearField(6);
 }
 
 class UpdateTaskResponse extends $pb.GeneratedMessage {
@@ -378,11 +478,76 @@ class GetTaskRequest extends $pb.GeneratedMessage {
   void clearId() => clearField(1);
 }
 
-class GetTaskResponse_Subtask extends $pb.GeneratedMessage {
-  factory GetTaskResponse_Subtask({
+class GetTaskResponse_Patient extends $pb.GeneratedMessage {
+  factory GetTaskResponse_Patient({
+    $core.String? id,
+    $core.String? humanReadableIdentifier,
+  }) {
+    final $result = create();
+    if (id != null) {
+      $result.id = id;
+    }
+    if (humanReadableIdentifier != null) {
+      $result.humanReadableIdentifier = humanReadableIdentifier;
+    }
+    return $result;
+  }
+  GetTaskResponse_Patient._() : super();
+  factory GetTaskResponse_Patient.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory GetTaskResponse_Patient.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetTaskResponse.Patient', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'id')
+    ..aOS(2, _omitFieldNames ? '' : 'humanReadableIdentifier')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  GetTaskResponse_Patient clone() => GetTaskResponse_Patient()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  GetTaskResponse_Patient copyWith(void Function(GetTaskResponse_Patient) updates) => super.copyWith((message) => updates(message as GetTaskResponse_Patient)) as GetTaskResponse_Patient;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetTaskResponse_Patient create() => GetTaskResponse_Patient._();
+  GetTaskResponse_Patient createEmptyInstance() => create();
+  static $pb.PbList<GetTaskResponse_Patient> createRepeated() => $pb.PbList<GetTaskResponse_Patient>();
+  @$core.pragma('dart2js:noInline')
+  static GetTaskResponse_Patient getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetTaskResponse_Patient>(create);
+  static GetTaskResponse_Patient? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get id => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set id($core.String v) { $_setString(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearId() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get humanReadableIdentifier => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set humanReadableIdentifier($core.String v) { $_setString(1, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasHumanReadableIdentifier() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearHumanReadableIdentifier() => clearField(2);
+}
+
+class GetTaskResponse_SubTask extends $pb.GeneratedMessage {
+  factory GetTaskResponse_SubTask({
     $core.String? id,
     $core.String? name,
     $core.bool? done,
+    $core.String? createdBy,
   }) {
     final $result = create();
     if (id != null) {
@@ -394,16 +559,20 @@ class GetTaskResponse_Subtask extends $pb.GeneratedMessage {
     if (done != null) {
       $result.done = done;
     }
+    if (createdBy != null) {
+      $result.createdBy = createdBy;
+    }
     return $result;
   }
-  GetTaskResponse_Subtask._() : super();
-  factory GetTaskResponse_Subtask.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetTaskResponse_Subtask.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  GetTaskResponse_SubTask._() : super();
+  factory GetTaskResponse_SubTask.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory GetTaskResponse_SubTask.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetTaskResponse.Subtask', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetTaskResponse.SubTask', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'id')
     ..aOS(2, _omitFieldNames ? '' : 'name')
     ..aOB(3, _omitFieldNames ? '' : 'done')
+    ..aOS(4, _omitFieldNames ? '' : 'createdBy')
     ..hasRequiredFields = false
   ;
 
@@ -411,22 +580,22 @@ class GetTaskResponse_Subtask extends $pb.GeneratedMessage {
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  GetTaskResponse_Subtask clone() => GetTaskResponse_Subtask()..mergeFromMessage(this);
+  GetTaskResponse_SubTask clone() => GetTaskResponse_SubTask()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  GetTaskResponse_Subtask copyWith(void Function(GetTaskResponse_Subtask) updates) => super.copyWith((message) => updates(message as GetTaskResponse_Subtask)) as GetTaskResponse_Subtask;
+  GetTaskResponse_SubTask copyWith(void Function(GetTaskResponse_SubTask) updates) => super.copyWith((message) => updates(message as GetTaskResponse_SubTask)) as GetTaskResponse_SubTask;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static GetTaskResponse_Subtask create() => GetTaskResponse_Subtask._();
-  GetTaskResponse_Subtask createEmptyInstance() => create();
-  static $pb.PbList<GetTaskResponse_Subtask> createRepeated() => $pb.PbList<GetTaskResponse_Subtask>();
+  static GetTaskResponse_SubTask create() => GetTaskResponse_SubTask._();
+  GetTaskResponse_SubTask createEmptyInstance() => create();
+  static $pb.PbList<GetTaskResponse_SubTask> createRepeated() => $pb.PbList<GetTaskResponse_SubTask>();
   @$core.pragma('dart2js:noInline')
-  static GetTaskResponse_Subtask getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetTaskResponse_Subtask>(create);
-  static GetTaskResponse_Subtask? _defaultInstance;
+  static GetTaskResponse_SubTask getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetTaskResponse_SubTask>(create);
+  static GetTaskResponse_SubTask? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get id => $_getSZ(0);
@@ -454,6 +623,15 @@ class GetTaskResponse_Subtask extends $pb.GeneratedMessage {
   $core.bool hasDone() => $_has(2);
   @$pb.TagNumber(3)
   void clearDone() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.String get createdBy => $_getSZ(3);
+  @$pb.TagNumber(4)
+  set createdBy($core.String v) { $_setString(3, v); }
+  @$pb.TagNumber(4)
+  $core.bool hasCreatedBy() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearCreatedBy() => clearField(4);
 }
 
 class GetTaskResponse extends $pb.GeneratedMessage {
@@ -462,9 +640,13 @@ class GetTaskResponse extends $pb.GeneratedMessage {
     $core.String? name,
     $core.String? description,
     $core.String? assignedUserId,
-    $core.Iterable<GetTaskResponse_Subtask>? subtasks,
+    $core.Iterable<GetTaskResponse_SubTask>? subtasks,
     $22.TaskStatus? status,
     $20.Timestamp? createdAt,
+    $core.bool? public,
+    $20.Timestamp? dueAt,
+    $core.String? createdBy,
+    GetTaskResponse_Patient? patient,
   }) {
     final $result = create();
     if (id != null) {
@@ -488,6 +670,18 @@ class GetTaskResponse extends $pb.GeneratedMessage {
     if (createdAt != null) {
       $result.createdAt = createdAt;
     }
+    if (public != null) {
+      $result.public = public;
+    }
+    if (dueAt != null) {
+      $result.dueAt = dueAt;
+    }
+    if (createdBy != null) {
+      $result.createdBy = createdBy;
+    }
+    if (patient != null) {
+      $result.patient = patient;
+    }
     return $result;
   }
   GetTaskResponse._() : super();
@@ -499,9 +693,13 @@ class GetTaskResponse extends $pb.GeneratedMessage {
     ..aOS(2, _omitFieldNames ? '' : 'name')
     ..aOS(3, _omitFieldNames ? '' : 'description')
     ..aOS(4, _omitFieldNames ? '' : 'assignedUserId')
-    ..pc<GetTaskResponse_Subtask>(5, _omitFieldNames ? '' : 'subtasks', $pb.PbFieldType.PM, subBuilder: GetTaskResponse_Subtask.create)
+    ..pc<GetTaskResponse_SubTask>(5, _omitFieldNames ? '' : 'subtasks', $pb.PbFieldType.PM, subBuilder: GetTaskResponse_SubTask.create)
     ..e<$22.TaskStatus>(6, _omitFieldNames ? '' : 'status', $pb.PbFieldType.OE, defaultOrMaker: $22.TaskStatus.TASK_STATUS_UNSPECIFIED, valueOf: $22.TaskStatus.valueOf, enumValues: $22.TaskStatus.values)
     ..aOM<$20.Timestamp>(7, _omitFieldNames ? '' : 'createdAt', subBuilder: $20.Timestamp.create)
+    ..aOB(8, _omitFieldNames ? '' : 'public')
+    ..aOM<$20.Timestamp>(9, _omitFieldNames ? '' : 'dueAt', subBuilder: $20.Timestamp.create)
+    ..aOS(10, _omitFieldNames ? '' : 'createdBy')
+    ..aOM<GetTaskResponse_Patient>(11, _omitFieldNames ? '' : 'patient', subBuilder: GetTaskResponse_Patient.create)
     ..hasRequiredFields = false
   ;
 
@@ -563,7 +761,7 @@ class GetTaskResponse extends $pb.GeneratedMessage {
   void clearAssignedUserId() => clearField(4);
 
   @$pb.TagNumber(5)
-  $core.List<GetTaskResponse_Subtask> get subtasks => $_getList(4);
+  $core.List<GetTaskResponse_SubTask> get subtasks => $_getList(4);
 
   @$pb.TagNumber(6)
   $22.TaskStatus get status => $_getN(5);
@@ -584,6 +782,46 @@ class GetTaskResponse extends $pb.GeneratedMessage {
   void clearCreatedAt() => clearField(7);
   @$pb.TagNumber(7)
   $20.Timestamp ensureCreatedAt() => $_ensure(6);
+
+  @$pb.TagNumber(8)
+  $core.bool get public => $_getBF(7);
+  @$pb.TagNumber(8)
+  set public($core.bool v) { $_setBool(7, v); }
+  @$pb.TagNumber(8)
+  $core.bool hasPublic() => $_has(7);
+  @$pb.TagNumber(8)
+  void clearPublic() => clearField(8);
+
+  @$pb.TagNumber(9)
+  $20.Timestamp get dueAt => $_getN(8);
+  @$pb.TagNumber(9)
+  set dueAt($20.Timestamp v) { setField(9, v); }
+  @$pb.TagNumber(9)
+  $core.bool hasDueAt() => $_has(8);
+  @$pb.TagNumber(9)
+  void clearDueAt() => clearField(9);
+  @$pb.TagNumber(9)
+  $20.Timestamp ensureDueAt() => $_ensure(8);
+
+  @$pb.TagNumber(10)
+  $core.String get createdBy => $_getSZ(9);
+  @$pb.TagNumber(10)
+  set createdBy($core.String v) { $_setString(9, v); }
+  @$pb.TagNumber(10)
+  $core.bool hasCreatedBy() => $_has(9);
+  @$pb.TagNumber(10)
+  void clearCreatedBy() => clearField(10);
+
+  @$pb.TagNumber(11)
+  GetTaskResponse_Patient get patient => $_getN(10);
+  @$pb.TagNumber(11)
+  set patient(GetTaskResponse_Patient v) { setField(11, v); }
+  @$pb.TagNumber(11)
+  $core.bool hasPatient() => $_has(10);
+  @$pb.TagNumber(11)
+  void clearPatient() => clearField(11);
+  @$pb.TagNumber(11)
+  GetTaskResponse_Patient ensurePatient() => $_ensure(10);
 }
 
 class GetTasksByPatientRequest extends $pb.GeneratedMessage {
@@ -1371,14 +1609,14 @@ class GetAssignedTasksRequest extends $pb.GeneratedMessage {
 class GetAssignedTasksResponse_Task_Patient extends $pb.GeneratedMessage {
   factory GetAssignedTasksResponse_Task_Patient({
     $core.String? id,
-    $core.String? name,
+    $core.String? humanReadableIdentifier,
   }) {
     final $result = create();
     if (id != null) {
       $result.id = id;
     }
-    if (name != null) {
-      $result.name = name;
+    if (humanReadableIdentifier != null) {
+      $result.humanReadableIdentifier = humanReadableIdentifier;
     }
     return $result;
   }
@@ -1388,7 +1626,7 @@ class GetAssignedTasksResponse_Task_Patient extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAssignedTasksResponse.Task.Patient', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'id')
-    ..aOS(2, _omitFieldNames ? '' : 'name')
+    ..aOS(2, _omitFieldNames ? '' : 'humanReadableIdentifier')
     ..hasRequiredFields = false
   ;
 
@@ -1423,13 +1661,13 @@ class GetAssignedTasksResponse_Task_Patient extends $pb.GeneratedMessage {
   void clearId() => clearField(1);
 
   @$pb.TagNumber(2)
-  $core.String get name => $_getSZ(1);
+  $core.String get humanReadableIdentifier => $_getSZ(1);
   @$pb.TagNumber(2)
-  set name($core.String v) { $_setString(1, v); }
+  set humanReadableIdentifier($core.String v) { $_setString(1, v); }
   @$pb.TagNumber(2)
-  $core.bool hasName() => $_has(1);
+  $core.bool hasHumanReadableIdentifier() => $_has(1);
   @$pb.TagNumber(2)
-  void clearName() => clearField(2);
+  void clearHumanReadableIdentifier() => clearField(2);
 }
 
 class GetAssignedTasksResponse_Task_SubTask extends $pb.GeneratedMessage {
@@ -1953,11 +2191,15 @@ class UnassignTaskResponse extends $pb.GeneratedMessage {
 class CreateSubtaskRequest_Subtask extends $pb.GeneratedMessage {
   factory CreateSubtaskRequest_Subtask({
     $core.String? name,
+    $core.bool? done,
   }) {
     final $result = create();
     if (name != null) {
       $result.name = name;
     }
+    if (done != null) {
+      $result.done = done;
+    }
     return $result;
   }
   CreateSubtaskRequest_Subtask._() : super();
@@ -1966,6 +2208,7 @@ class CreateSubtaskRequest_Subtask extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateSubtaskRequest.Subtask', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'name')
+    ..aOB(2, _omitFieldNames ? '' : 'done')
     ..hasRequiredFields = false
   ;
 
@@ -1998,6 +2241,15 @@ class CreateSubtaskRequest_Subtask extends $pb.GeneratedMessage {
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
   void clearName() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.bool get done => $_getBF(1);
+  @$pb.TagNumber(2)
+  set done($core.bool v) { $_setBool(1, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasDone() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearDone() => clearField(2);
 }
 
 class CreateSubtaskRequest extends $pb.GeneratedMessage {
@@ -2119,11 +2371,15 @@ class CreateSubtaskResponse extends $pb.GeneratedMessage {
 class UpdateSubtaskRequest_Subtask extends $pb.GeneratedMessage {
   factory UpdateSubtaskRequest_Subtask({
     $core.String? name,
+    $core.bool? done,
   }) {
     final $result = create();
     if (name != null) {
       $result.name = name;
     }
+    if (done != null) {
+      $result.done = done;
+    }
     return $result;
   }
   UpdateSubtaskRequest_Subtask._() : super();
@@ -2132,6 +2388,7 @@ class UpdateSubtaskRequest_Subtask extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UpdateSubtaskRequest.Subtask', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'name')
+    ..aOB(2, _omitFieldNames ? '' : 'done')
     ..hasRequiredFields = false
   ;
 
@@ -2164,6 +2421,15 @@ class UpdateSubtaskRequest_Subtask extends $pb.GeneratedMessage {
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
   void clearName() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.bool get done => $_getBF(1);
+  @$pb.TagNumber(2)
+  set done($core.bool v) { $_setBool(1, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasDone() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearDone() => clearField(2);
 }
 
 class UpdateSubtaskRequest extends $pb.GeneratedMessage {
@@ -2278,8 +2544,8 @@ class UpdateSubtaskResponse extends $pb.GeneratedMessage {
   static UpdateSubtaskResponse? _defaultInstance;
 }
 
-class CompleteSubtaskRequest extends $pb.GeneratedMessage {
-  factory CompleteSubtaskRequest({
+class DeleteSubtaskRequest extends $pb.GeneratedMessage {
+  factory DeleteSubtaskRequest({
     $core.String? taskId,
     $core.String? subtaskId,
   }) {
@@ -2292,11 +2558,11 @@ class CompleteSubtaskRequest extends $pb.GeneratedMessage {
     }
     return $result;
   }
-  CompleteSubtaskRequest._() : super();
-  factory CompleteSubtaskRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory CompleteSubtaskRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  DeleteSubtaskRequest._() : super();
+  factory DeleteSubtaskRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory DeleteSubtaskRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CompleteSubtaskRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteSubtaskRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'taskId')
     ..aOS(2, _omitFieldNames ? '' : 'subtaskId')
     ..hasRequiredFields = false
@@ -2306,22 +2572,22 @@ class CompleteSubtaskRequest extends $pb.GeneratedMessage {
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  CompleteSubtaskRequest clone() => CompleteSubtaskRequest()..mergeFromMessage(this);
+  DeleteSubtaskRequest clone() => DeleteSubtaskRequest()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  CompleteSubtaskRequest copyWith(void Function(CompleteSubtaskRequest) updates) => super.copyWith((message) => updates(message as CompleteSubtaskRequest)) as CompleteSubtaskRequest;
+  DeleteSubtaskRequest copyWith(void Function(DeleteSubtaskRequest) updates) => super.copyWith((message) => updates(message as DeleteSubtaskRequest)) as DeleteSubtaskRequest;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static CompleteSubtaskRequest create() => CompleteSubtaskRequest._();
-  CompleteSubtaskRequest createEmptyInstance() => create();
-  static $pb.PbList<CompleteSubtaskRequest> createRepeated() => $pb.PbList<CompleteSubtaskRequest>();
+  static DeleteSubtaskRequest create() => DeleteSubtaskRequest._();
+  DeleteSubtaskRequest createEmptyInstance() => create();
+  static $pb.PbList<DeleteSubtaskRequest> createRepeated() => $pb.PbList<DeleteSubtaskRequest>();
   @$core.pragma('dart2js:noInline')
-  static CompleteSubtaskRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CompleteSubtaskRequest>(create);
-  static CompleteSubtaskRequest? _defaultInstance;
+  static DeleteSubtaskRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<DeleteSubtaskRequest>(create);
+  static DeleteSubtaskRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get taskId => $_getSZ(0);
@@ -2342,13 +2608,13 @@ class CompleteSubtaskRequest extends $pb.GeneratedMessage {
   void clearSubtaskId() => clearField(2);
 }
 
-class CompleteSubtaskResponse extends $pb.GeneratedMessage {
-  factory CompleteSubtaskResponse() => create();
-  CompleteSubtaskResponse._() : super();
-  factory CompleteSubtaskResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory CompleteSubtaskResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+class DeleteSubtaskResponse extends $pb.GeneratedMessage {
+  factory DeleteSubtaskResponse() => create();
+  DeleteSubtaskResponse._() : super();
+  factory DeleteSubtaskResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory DeleteSubtaskResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CompleteSubtaskResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteSubtaskResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
     ..hasRequiredFields = false
   ;
 
@@ -2356,45 +2622,40 @@ class CompleteSubtaskResponse extends $pb.GeneratedMessage {
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  CompleteSubtaskResponse clone() => CompleteSubtaskResponse()..mergeFromMessage(this);
+  DeleteSubtaskResponse clone() => DeleteSubtaskResponse()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  CompleteSubtaskResponse copyWith(void Function(CompleteSubtaskResponse) updates) => super.copyWith((message) => updates(message as CompleteSubtaskResponse)) as CompleteSubtaskResponse;
+  DeleteSubtaskResponse copyWith(void Function(DeleteSubtaskResponse) updates) => super.copyWith((message) => updates(message as DeleteSubtaskResponse)) as DeleteSubtaskResponse;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static CompleteSubtaskResponse create() => CompleteSubtaskResponse._();
-  CompleteSubtaskResponse createEmptyInstance() => create();
-  static $pb.PbList<CompleteSubtaskResponse> createRepeated() => $pb.PbList<CompleteSubtaskResponse>();
+  static DeleteSubtaskResponse create() => DeleteSubtaskResponse._();
+  DeleteSubtaskResponse createEmptyInstance() => create();
+  static $pb.PbList<DeleteSubtaskResponse> createRepeated() => $pb.PbList<DeleteSubtaskResponse>();
   @$core.pragma('dart2js:noInline')
-  static CompleteSubtaskResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CompleteSubtaskResponse>(create);
-  static CompleteSubtaskResponse? _defaultInstance;
+  static DeleteSubtaskResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<DeleteSubtaskResponse>(create);
+  static DeleteSubtaskResponse? _defaultInstance;
 }
 
-class UncompleteSubtaskRequest extends $pb.GeneratedMessage {
-  factory UncompleteSubtaskRequest({
+class RemoveTaskDueDateRequest extends $pb.GeneratedMessage {
+  factory RemoveTaskDueDateRequest({
     $core.String? taskId,
-    $core.String? subtaskId,
   }) {
     final $result = create();
     if (taskId != null) {
       $result.taskId = taskId;
     }
-    if (subtaskId != null) {
-      $result.subtaskId = subtaskId;
-    }
     return $result;
   }
-  UncompleteSubtaskRequest._() : super();
-  factory UncompleteSubtaskRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory UncompleteSubtaskRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  RemoveTaskDueDateRequest._() : super();
+  factory RemoveTaskDueDateRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory RemoveTaskDueDateRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UncompleteSubtaskRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RemoveTaskDueDateRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'taskId')
-    ..aOS(2, _omitFieldNames ? '' : 'subtaskId')
     ..hasRequiredFields = false
   ;
 
@@ -2402,22 +2663,22 @@ class UncompleteSubtaskRequest extends $pb.GeneratedMessage {
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  UncompleteSubtaskRequest clone() => UncompleteSubtaskRequest()..mergeFromMessage(this);
+  RemoveTaskDueDateRequest clone() => RemoveTaskDueDateRequest()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  UncompleteSubtaskRequest copyWith(void Function(UncompleteSubtaskRequest) updates) => super.copyWith((message) => updates(message as UncompleteSubtaskRequest)) as UncompleteSubtaskRequest;
+  RemoveTaskDueDateRequest copyWith(void Function(RemoveTaskDueDateRequest) updates) => super.copyWith((message) => updates(message as RemoveTaskDueDateRequest)) as RemoveTaskDueDateRequest;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static UncompleteSubtaskRequest create() => UncompleteSubtaskRequest._();
-  UncompleteSubtaskRequest createEmptyInstance() => create();
-  static $pb.PbList<UncompleteSubtaskRequest> createRepeated() => $pb.PbList<UncompleteSubtaskRequest>();
+  static RemoveTaskDueDateRequest create() => RemoveTaskDueDateRequest._();
+  RemoveTaskDueDateRequest createEmptyInstance() => create();
+  static $pb.PbList<RemoveTaskDueDateRequest> createRepeated() => $pb.PbList<RemoveTaskDueDateRequest>();
   @$core.pragma('dart2js:noInline')
-  static UncompleteSubtaskRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<UncompleteSubtaskRequest>(create);
-  static UncompleteSubtaskRequest? _defaultInstance;
+  static RemoveTaskDueDateRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<RemoveTaskDueDateRequest>(create);
+  static RemoveTaskDueDateRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get taskId => $_getSZ(0);
@@ -2427,24 +2688,15 @@ class UncompleteSubtaskRequest extends $pb.GeneratedMessage {
   $core.bool hasTaskId() => $_has(0);
   @$pb.TagNumber(1)
   void clearTaskId() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.String get subtaskId => $_getSZ(1);
-  @$pb.TagNumber(2)
-  set subtaskId($core.String v) { $_setString(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasSubtaskId() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearSubtaskId() => clearField(2);
 }
 
-class UncompleteSubtaskResponse extends $pb.GeneratedMessage {
-  factory UncompleteSubtaskResponse() => create();
-  UncompleteSubtaskResponse._() : super();
-  factory UncompleteSubtaskResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory UncompleteSubtaskResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+class RemoveTaskDueDateResponse extends $pb.GeneratedMessage {
+  factory RemoveTaskDueDateResponse() => create();
+  RemoveTaskDueDateResponse._() : super();
+  factory RemoveTaskDueDateResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory RemoveTaskDueDateResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UncompleteSubtaskResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RemoveTaskDueDateResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
     ..hasRequiredFields = false
   ;
 
@@ -2452,45 +2704,40 @@ class UncompleteSubtaskResponse extends $pb.GeneratedMessage {
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  UncompleteSubtaskResponse clone() => UncompleteSubtaskResponse()..mergeFromMessage(this);
+  RemoveTaskDueDateResponse clone() => RemoveTaskDueDateResponse()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  UncompleteSubtaskResponse copyWith(void Function(UncompleteSubtaskResponse) updates) => super.copyWith((message) => updates(message as UncompleteSubtaskResponse)) as UncompleteSubtaskResponse;
+  RemoveTaskDueDateResponse copyWith(void Function(RemoveTaskDueDateResponse) updates) => super.copyWith((message) => updates(message as RemoveTaskDueDateResponse)) as RemoveTaskDueDateResponse;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static UncompleteSubtaskResponse create() => UncompleteSubtaskResponse._();
-  UncompleteSubtaskResponse createEmptyInstance() => create();
-  static $pb.PbList<UncompleteSubtaskResponse> createRepeated() => $pb.PbList<UncompleteSubtaskResponse>();
+  static RemoveTaskDueDateResponse create() => RemoveTaskDueDateResponse._();
+  RemoveTaskDueDateResponse createEmptyInstance() => create();
+  static $pb.PbList<RemoveTaskDueDateResponse> createRepeated() => $pb.PbList<RemoveTaskDueDateResponse>();
   @$core.pragma('dart2js:noInline')
-  static UncompleteSubtaskResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<UncompleteSubtaskResponse>(create);
-  static UncompleteSubtaskResponse? _defaultInstance;
+  static RemoveTaskDueDateResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<RemoveTaskDueDateResponse>(create);
+  static RemoveTaskDueDateResponse? _defaultInstance;
 }
 
-class DeleteSubtaskRequest extends $pb.GeneratedMessage {
-  factory DeleteSubtaskRequest({
-    $core.String? taskId,
-    $core.String? subtaskId,
+class DeleteTaskRequest extends $pb.GeneratedMessage {
+  factory DeleteTaskRequest({
+    $core.String? id,
   }) {
     final $result = create();
-    if (taskId != null) {
-      $result.taskId = taskId;
-    }
-    if (subtaskId != null) {
-      $result.subtaskId = subtaskId;
+    if (id != null) {
+      $result.id = id;
     }
     return $result;
   }
-  DeleteSubtaskRequest._() : super();
-  factory DeleteSubtaskRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory DeleteSubtaskRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  DeleteTaskRequest._() : super();
+  factory DeleteTaskRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory DeleteTaskRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteSubtaskRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'taskId')
-    ..aOS(2, _omitFieldNames ? '' : 'subtaskId')
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteTaskRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'id')
     ..hasRequiredFields = false
   ;
 
@@ -2498,49 +2745,40 @@ class DeleteSubtaskRequest extends $pb.GeneratedMessage {
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  DeleteSubtaskRequest clone() => DeleteSubtaskRequest()..mergeFromMessage(this);
+  DeleteTaskRequest clone() => DeleteTaskRequest()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  DeleteSubtaskRequest copyWith(void Function(DeleteSubtaskRequest) updates) => super.copyWith((message) => updates(message as DeleteSubtaskRequest)) as DeleteSubtaskRequest;
+  DeleteTaskRequest copyWith(void Function(DeleteTaskRequest) updates) => super.copyWith((message) => updates(message as DeleteTaskRequest)) as DeleteTaskRequest;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static DeleteSubtaskRequest create() => DeleteSubtaskRequest._();
-  DeleteSubtaskRequest createEmptyInstance() => create();
-  static $pb.PbList<DeleteSubtaskRequest> createRepeated() => $pb.PbList<DeleteSubtaskRequest>();
+  static DeleteTaskRequest create() => DeleteTaskRequest._();
+  DeleteTaskRequest createEmptyInstance() => create();
+  static $pb.PbList<DeleteTaskRequest> createRepeated() => $pb.PbList<DeleteTaskRequest>();
   @$core.pragma('dart2js:noInline')
-  static DeleteSubtaskRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<DeleteSubtaskRequest>(create);
-  static DeleteSubtaskRequest? _defaultInstance;
+  static DeleteTaskRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<DeleteTaskRequest>(create);
+  static DeleteTaskRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.String get taskId => $_getSZ(0);
+  $core.String get id => $_getSZ(0);
   @$pb.TagNumber(1)
-  set taskId($core.String v) { $_setString(0, v); }
+  set id($core.String v) { $_setString(0, v); }
   @$pb.TagNumber(1)
-  $core.bool hasTaskId() => $_has(0);
+  $core.bool hasId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearTaskId() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.String get subtaskId => $_getSZ(1);
-  @$pb.TagNumber(2)
-  set subtaskId($core.String v) { $_setString(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasSubtaskId() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearSubtaskId() => clearField(2);
+  void clearId() => clearField(1);
 }
 
-class DeleteSubtaskResponse extends $pb.GeneratedMessage {
-  factory DeleteSubtaskResponse() => create();
-  DeleteSubtaskResponse._() : super();
-  factory DeleteSubtaskResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory DeleteSubtaskResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+class DeleteTaskResponse extends $pb.GeneratedMessage {
+  factory DeleteTaskResponse() => create();
+  DeleteTaskResponse._() : super();
+  factory DeleteTaskResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory DeleteTaskResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteSubtaskResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteTaskResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
     ..hasRequiredFields = false
   ;
 
@@ -2548,22 +2786,22 @@ class DeleteSubtaskResponse extends $pb.GeneratedMessage {
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  DeleteSubtaskResponse clone() => DeleteSubtaskResponse()..mergeFromMessage(this);
+  DeleteTaskResponse clone() => DeleteTaskResponse()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  DeleteSubtaskResponse copyWith(void Function(DeleteSubtaskResponse) updates) => super.copyWith((message) => updates(message as DeleteSubtaskResponse)) as DeleteSubtaskResponse;
+  DeleteTaskResponse copyWith(void Function(DeleteTaskResponse) updates) => super.copyWith((message) => updates(message as DeleteTaskResponse)) as DeleteTaskResponse;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static DeleteSubtaskResponse create() => DeleteSubtaskResponse._();
-  DeleteSubtaskResponse createEmptyInstance() => create();
-  static $pb.PbList<DeleteSubtaskResponse> createRepeated() => $pb.PbList<DeleteSubtaskResponse>();
+  static DeleteTaskResponse create() => DeleteTaskResponse._();
+  DeleteTaskResponse createEmptyInstance() => create();
+  static $pb.PbList<DeleteTaskResponse> createRepeated() => $pb.PbList<DeleteTaskResponse>();
   @$core.pragma('dart2js:noInline')
-  static DeleteSubtaskResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<DeleteSubtaskResponse>(create);
-  static DeleteSubtaskResponse? _defaultInstance;
+  static DeleteTaskResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<DeleteTaskResponse>(create);
+  static DeleteTaskResponse? _defaultInstance;
 }
 
 
diff --git a/gen/dart/lib/services/tasks_svc/v1/task_svc.pbgrpc.dart b/gen/dart/lib/services/tasks_svc/v1/task_svc.pbgrpc.dart
index ec085e767..a814d845c 100644
--- a/gen/dart/lib/services/tasks_svc/v1/task_svc.pbgrpc.dart
+++ b/gen/dart/lib/services/tasks_svc/v1/task_svc.pbgrpc.dart
@@ -61,18 +61,18 @@ class TaskServiceClient extends $grpc.Client {
       '/services.tasks_svc.v1.TaskService/UpdateSubtask',
       ($15.UpdateSubtaskRequest value) => value.writeToBuffer(),
       ($core.List<$core.int> value) => $15.UpdateSubtaskResponse.fromBuffer(value));
-  static final _$completeSubtask = $grpc.ClientMethod<$15.CompleteSubtaskRequest, $15.CompleteSubtaskResponse>(
-      '/services.tasks_svc.v1.TaskService/CompleteSubtask',
-      ($15.CompleteSubtaskRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $15.CompleteSubtaskResponse.fromBuffer(value));
-  static final _$uncompleteSubtask = $grpc.ClientMethod<$15.UncompleteSubtaskRequest, $15.UncompleteSubtaskResponse>(
-      '/services.tasks_svc.v1.TaskService/UncompleteSubtask',
-      ($15.UncompleteSubtaskRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $15.UncompleteSubtaskResponse.fromBuffer(value));
   static final _$deleteSubtask = $grpc.ClientMethod<$15.DeleteSubtaskRequest, $15.DeleteSubtaskResponse>(
       '/services.tasks_svc.v1.TaskService/DeleteSubtask',
       ($15.DeleteSubtaskRequest value) => value.writeToBuffer(),
       ($core.List<$core.int> value) => $15.DeleteSubtaskResponse.fromBuffer(value));
+  static final _$removeTaskDueDate = $grpc.ClientMethod<$15.RemoveTaskDueDateRequest, $15.RemoveTaskDueDateResponse>(
+      '/services.tasks_svc.v1.TaskService/RemoveTaskDueDate',
+      ($15.RemoveTaskDueDateRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $15.RemoveTaskDueDateResponse.fromBuffer(value));
+  static final _$deleteTask = $grpc.ClientMethod<$15.DeleteTaskRequest, $15.DeleteTaskResponse>(
+      '/services.tasks_svc.v1.TaskService/DeleteTask',
+      ($15.DeleteTaskRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $15.DeleteTaskResponse.fromBuffer(value));
 
   TaskServiceClient($grpc.ClientChannel channel,
       {$grpc.CallOptions? options,
@@ -120,16 +120,16 @@ class TaskServiceClient extends $grpc.Client {
     return $createUnaryCall(_$updateSubtask, request, options: options);
   }
 
-  $grpc.ResponseFuture<$15.CompleteSubtaskResponse> completeSubtask($15.CompleteSubtaskRequest request, {$grpc.CallOptions? options}) {
-    return $createUnaryCall(_$completeSubtask, request, options: options);
+  $grpc.ResponseFuture<$15.DeleteSubtaskResponse> deleteSubtask($15.DeleteSubtaskRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$deleteSubtask, request, options: options);
   }
 
-  $grpc.ResponseFuture<$15.UncompleteSubtaskResponse> uncompleteSubtask($15.UncompleteSubtaskRequest request, {$grpc.CallOptions? options}) {
-    return $createUnaryCall(_$uncompleteSubtask, request, options: options);
+  $grpc.ResponseFuture<$15.RemoveTaskDueDateResponse> removeTaskDueDate($15.RemoveTaskDueDateRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$removeTaskDueDate, request, options: options);
   }
 
-  $grpc.ResponseFuture<$15.DeleteSubtaskResponse> deleteSubtask($15.DeleteSubtaskRequest request, {$grpc.CallOptions? options}) {
-    return $createUnaryCall(_$deleteSubtask, request, options: options);
+  $grpc.ResponseFuture<$15.DeleteTaskResponse> deleteTask($15.DeleteTaskRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$deleteTask, request, options: options);
   }
 }
 
@@ -208,20 +208,6 @@ abstract class TaskServiceBase extends $grpc.Service {
         false,
         ($core.List<$core.int> value) => $15.UpdateSubtaskRequest.fromBuffer(value),
         ($15.UpdateSubtaskResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$15.CompleteSubtaskRequest, $15.CompleteSubtaskResponse>(
-        'CompleteSubtask',
-        completeSubtask_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $15.CompleteSubtaskRequest.fromBuffer(value),
-        ($15.CompleteSubtaskResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$15.UncompleteSubtaskRequest, $15.UncompleteSubtaskResponse>(
-        'UncompleteSubtask',
-        uncompleteSubtask_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $15.UncompleteSubtaskRequest.fromBuffer(value),
-        ($15.UncompleteSubtaskResponse value) => value.writeToBuffer()));
     $addMethod($grpc.ServiceMethod<$15.DeleteSubtaskRequest, $15.DeleteSubtaskResponse>(
         'DeleteSubtask',
         deleteSubtask_Pre,
@@ -229,6 +215,20 @@ abstract class TaskServiceBase extends $grpc.Service {
         false,
         ($core.List<$core.int> value) => $15.DeleteSubtaskRequest.fromBuffer(value),
         ($15.DeleteSubtaskResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$15.RemoveTaskDueDateRequest, $15.RemoveTaskDueDateResponse>(
+        'RemoveTaskDueDate',
+        removeTaskDueDate_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $15.RemoveTaskDueDateRequest.fromBuffer(value),
+        ($15.RemoveTaskDueDateResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$15.DeleteTaskRequest, $15.DeleteTaskResponse>(
+        'DeleteTask',
+        deleteTask_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $15.DeleteTaskRequest.fromBuffer(value),
+        ($15.DeleteTaskResponse value) => value.writeToBuffer()));
   }
 
   $async.Future<$15.CreateTaskResponse> createTask_Pre($grpc.ServiceCall call, $async.Future<$15.CreateTaskRequest> request) async {
@@ -271,16 +271,16 @@ abstract class TaskServiceBase extends $grpc.Service {
     return updateSubtask(call, await request);
   }
 
-  $async.Future<$15.CompleteSubtaskResponse> completeSubtask_Pre($grpc.ServiceCall call, $async.Future<$15.CompleteSubtaskRequest> request) async {
-    return completeSubtask(call, await request);
+  $async.Future<$15.DeleteSubtaskResponse> deleteSubtask_Pre($grpc.ServiceCall call, $async.Future<$15.DeleteSubtaskRequest> request) async {
+    return deleteSubtask(call, await request);
   }
 
-  $async.Future<$15.UncompleteSubtaskResponse> uncompleteSubtask_Pre($grpc.ServiceCall call, $async.Future<$15.UncompleteSubtaskRequest> request) async {
-    return uncompleteSubtask(call, await request);
+  $async.Future<$15.RemoveTaskDueDateResponse> removeTaskDueDate_Pre($grpc.ServiceCall call, $async.Future<$15.RemoveTaskDueDateRequest> request) async {
+    return removeTaskDueDate(call, await request);
   }
 
-  $async.Future<$15.DeleteSubtaskResponse> deleteSubtask_Pre($grpc.ServiceCall call, $async.Future<$15.DeleteSubtaskRequest> request) async {
-    return deleteSubtask(call, await request);
+  $async.Future<$15.DeleteTaskResponse> deleteTask_Pre($grpc.ServiceCall call, $async.Future<$15.DeleteTaskRequest> request) async {
+    return deleteTask(call, await request);
   }
 
   $async.Future<$15.CreateTaskResponse> createTask($grpc.ServiceCall call, $15.CreateTaskRequest request);
@@ -293,7 +293,7 @@ abstract class TaskServiceBase extends $grpc.Service {
   $async.Future<$15.UnassignTaskResponse> unassignTask($grpc.ServiceCall call, $15.UnassignTaskRequest request);
   $async.Future<$15.CreateSubtaskResponse> createSubtask($grpc.ServiceCall call, $15.CreateSubtaskRequest request);
   $async.Future<$15.UpdateSubtaskResponse> updateSubtask($grpc.ServiceCall call, $15.UpdateSubtaskRequest request);
-  $async.Future<$15.CompleteSubtaskResponse> completeSubtask($grpc.ServiceCall call, $15.CompleteSubtaskRequest request);
-  $async.Future<$15.UncompleteSubtaskResponse> uncompleteSubtask($grpc.ServiceCall call, $15.UncompleteSubtaskRequest request);
   $async.Future<$15.DeleteSubtaskResponse> deleteSubtask($grpc.ServiceCall call, $15.DeleteSubtaskRequest request);
+  $async.Future<$15.RemoveTaskDueDateResponse> removeTaskDueDate($grpc.ServiceCall call, $15.RemoveTaskDueDateRequest request);
+  $async.Future<$15.DeleteTaskResponse> deleteTask($grpc.ServiceCall call, $15.DeleteTaskRequest request);
 }
diff --git a/gen/dart/lib/services/tasks_svc/v1/task_svc.pbjson.dart b/gen/dart/lib/services/tasks_svc/v1/task_svc.pbjson.dart
index 660ccfa99..9f7036979 100644
--- a/gen/dart/lib/services/tasks_svc/v1/task_svc.pbjson.dart
+++ b/gen/dart/lib/services/tasks_svc/v1/task_svc.pbjson.dart
@@ -23,11 +23,24 @@ const CreateTaskRequest$json = {
     {'1': 'public', '3': 4, '4': 1, '5': 8, '9': 1, '10': 'public', '17': true},
     {'1': 'due_at', '3': 5, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '10': 'dueAt'},
     {'1': 'initial_status', '3': 6, '4': 1, '5': 14, '6': '.services.tasks_svc.v1.TaskStatus', '9': 2, '10': 'initialStatus', '17': true},
+    {'1': 'assigned_user_id', '3': 7, '4': 1, '5': 9, '9': 3, '10': 'assignedUserId', '17': true},
+    {'1': 'subtasks', '3': 8, '4': 3, '5': 11, '6': '.services.tasks_svc.v1.CreateTaskRequest.SubTask', '10': 'subtasks'},
   ],
+  '3': [CreateTaskRequest_SubTask$json],
   '8': [
     {'1': '_description'},
     {'1': '_public'},
     {'1': '_initial_status'},
+    {'1': '_assigned_user_id'},
+  ],
+};
+
+@$core.Deprecated('Use createTaskRequestDescriptor instead')
+const CreateTaskRequest_SubTask$json = {
+  '1': 'SubTask',
+  '2': [
+    {'1': 'name', '3': 1, '4': 1, '5': 9, '10': 'name'},
+    {'1': 'done', '3': 2, '4': 1, '5': 8, '10': 'done'},
   ],
 };
 
@@ -37,8 +50,12 @@ final $typed_data.Uint8List createTaskRequestDescriptor = $convert.base64Decode(
     'IgASgJSABSC2Rlc2NyaXB0aW9uiAEBEh0KCnBhdGllbnRfaWQYAyABKAlSCXBhdGllbnRJZBIb'
     'CgZwdWJsaWMYBCABKAhIAVIGcHVibGljiAEBEjEKBmR1ZV9hdBgFIAEoCzIaLmdvb2dsZS5wcm'
     '90b2J1Zi5UaW1lc3RhbXBSBWR1ZUF0Ek0KDmluaXRpYWxfc3RhdHVzGAYgASgOMiEuc2Vydmlj'
-    'ZXMudGFza3Nfc3ZjLnYxLlRhc2tTdGF0dXNIAlINaW5pdGlhbFN0YXR1c4gBAUIOCgxfZGVzY3'
-    'JpcHRpb25CCQoHX3B1YmxpY0IRCg9faW5pdGlhbF9zdGF0dXM=');
+    'ZXMudGFza3Nfc3ZjLnYxLlRhc2tTdGF0dXNIAlINaW5pdGlhbFN0YXR1c4gBARItChBhc3NpZ2'
+    '5lZF91c2VyX2lkGAcgASgJSANSDmFzc2lnbmVkVXNlcklkiAEBEkwKCHN1YnRhc2tzGAggAygL'
+    'MjAuc2VydmljZXMudGFza3Nfc3ZjLnYxLkNyZWF0ZVRhc2tSZXF1ZXN0LlN1YlRhc2tSCHN1Yn'
+    'Rhc2tzGjEKB1N1YlRhc2sSEgoEbmFtZRgBIAEoCVIEbmFtZRISCgRkb25lGAIgASgIUgRkb25l'
+    'Qg4KDF9kZXNjcmlwdGlvbkIJCgdfcHVibGljQhEKD19pbml0aWFsX3N0YXR1c0ITChFfYXNzaW'
+    'duZWRfdXNlcl9pZA==');
 
 @$core.Deprecated('Use createTaskResponseDescriptor instead')
 const CreateTaskResponse$json = {
@@ -61,12 +78,14 @@ const UpdateTaskRequest$json = {
     {'1': 'description', '3': 3, '4': 1, '5': 9, '9': 1, '10': 'description', '17': true},
     {'1': 'due_at', '3': 4, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '9': 2, '10': 'dueAt', '17': true},
     {'1': 'status', '3': 5, '4': 1, '5': 14, '6': '.services.tasks_svc.v1.TaskStatus', '9': 3, '10': 'status', '17': true},
+    {'1': 'public', '3': 6, '4': 1, '5': 8, '9': 4, '10': 'public', '17': true},
   ],
   '8': [
     {'1': '_name'},
     {'1': '_description'},
     {'1': '_due_at'},
     {'1': '_status'},
+    {'1': '_public'},
   ],
 };
 
@@ -75,8 +94,9 @@ final $typed_data.Uint8List updateTaskRequestDescriptor = $convert.base64Decode(
     'ChFVcGRhdGVUYXNrUmVxdWVzdBIOCgJpZBgBIAEoCVICaWQSFwoEbmFtZRgCIAEoCUgAUgRuYW'
     '1liAEBEiUKC2Rlc2NyaXB0aW9uGAMgASgJSAFSC2Rlc2NyaXB0aW9uiAEBEjYKBmR1ZV9hdBgE'
     'IAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBIAlIFZHVlQXSIAQESPgoGc3RhdHVzGA'
-    'UgASgOMiEuc2VydmljZXMudGFza3Nfc3ZjLnYxLlRhc2tTdGF0dXNIA1IGc3RhdHVziAEBQgcK'
-    'BV9uYW1lQg4KDF9kZXNjcmlwdGlvbkIJCgdfZHVlX2F0QgkKB19zdGF0dXM=');
+    'UgASgOMiEuc2VydmljZXMudGFza3Nfc3ZjLnYxLlRhc2tTdGF0dXNIA1IGc3RhdHVziAEBEhsK'
+    'BnB1YmxpYxgGIAEoCEgEUgZwdWJsaWOIAQFCBwoFX25hbWVCDgoMX2Rlc2NyaXB0aW9uQgkKB1'
+    '9kdWVfYXRCCQoHX3N0YXR1c0IJCgdfcHVibGlj');
 
 @$core.Deprecated('Use updateTaskResponseDescriptor instead')
 const UpdateTaskResponse$json = {
@@ -107,23 +127,37 @@ const GetTaskResponse$json = {
     {'1': 'name', '3': 2, '4': 1, '5': 9, '10': 'name'},
     {'1': 'description', '3': 3, '4': 1, '5': 9, '10': 'description'},
     {'1': 'assigned_user_id', '3': 4, '4': 1, '5': 9, '9': 0, '10': 'assignedUserId', '17': true},
-    {'1': 'subtasks', '3': 5, '4': 3, '5': 11, '6': '.services.tasks_svc.v1.GetTaskResponse.Subtask', '10': 'subtasks'},
+    {'1': 'subtasks', '3': 5, '4': 3, '5': 11, '6': '.services.tasks_svc.v1.GetTaskResponse.SubTask', '10': 'subtasks'},
     {'1': 'status', '3': 6, '4': 1, '5': 14, '6': '.services.tasks_svc.v1.TaskStatus', '10': 'status'},
     {'1': 'created_at', '3': 7, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '10': 'createdAt'},
+    {'1': 'public', '3': 8, '4': 1, '5': 8, '10': 'public'},
+    {'1': 'due_at', '3': 9, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '10': 'dueAt'},
+    {'1': 'created_by', '3': 10, '4': 1, '5': 9, '10': 'createdBy'},
+    {'1': 'patient', '3': 11, '4': 1, '5': 11, '6': '.services.tasks_svc.v1.GetTaskResponse.Patient', '10': 'patient'},
   ],
-  '3': [GetTaskResponse_Subtask$json],
+  '3': [GetTaskResponse_Patient$json, GetTaskResponse_SubTask$json],
   '8': [
     {'1': '_assigned_user_id'},
   ],
 };
 
 @$core.Deprecated('Use getTaskResponseDescriptor instead')
-const GetTaskResponse_Subtask$json = {
-  '1': 'Subtask',
+const GetTaskResponse_Patient$json = {
+  '1': 'Patient',
+  '2': [
+    {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
+    {'1': 'human_readable_identifier', '3': 2, '4': 1, '5': 9, '10': 'humanReadableIdentifier'},
+  ],
+};
+
+@$core.Deprecated('Use getTaskResponseDescriptor instead')
+const GetTaskResponse_SubTask$json = {
+  '1': 'SubTask',
   '2': [
     {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
     {'1': 'name', '3': 2, '4': 1, '5': 9, '10': 'name'},
     {'1': 'done', '3': 3, '4': 1, '5': 8, '10': 'done'},
+    {'1': 'created_by', '3': 4, '4': 1, '5': 9, '10': 'createdBy'},
   ],
 };
 
@@ -132,11 +166,16 @@ final $typed_data.Uint8List getTaskResponseDescriptor = $convert.base64Decode(
     'Cg9HZXRUYXNrUmVzcG9uc2USDgoCaWQYASABKAlSAmlkEhIKBG5hbWUYAiABKAlSBG5hbWUSIA'
     'oLZGVzY3JpcHRpb24YAyABKAlSC2Rlc2NyaXB0aW9uEi0KEGFzc2lnbmVkX3VzZXJfaWQYBCAB'
     'KAlIAFIOYXNzaWduZWRVc2VySWSIAQESSgoIc3VidGFza3MYBSADKAsyLi5zZXJ2aWNlcy50YX'
-    'Nrc19zdmMudjEuR2V0VGFza1Jlc3BvbnNlLlN1YnRhc2tSCHN1YnRhc2tzEjkKBnN0YXR1cxgG'
+    'Nrc19zdmMudjEuR2V0VGFza1Jlc3BvbnNlLlN1YlRhc2tSCHN1YnRhc2tzEjkKBnN0YXR1cxgG'
     'IAEoDjIhLnNlcnZpY2VzLnRhc2tzX3N2Yy52MS5UYXNrU3RhdHVzUgZzdGF0dXMSOQoKY3JlYX'
-    'RlZF9hdBgHIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBSCWNyZWF0ZWRBdBpBCgdT'
-    'dWJ0YXNrEg4KAmlkGAEgASgJUgJpZBISCgRuYW1lGAIgASgJUgRuYW1lEhIKBGRvbmUYAyABKA'
-    'hSBGRvbmVCEwoRX2Fzc2lnbmVkX3VzZXJfaWQ=');
+    'RlZF9hdBgHIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBSCWNyZWF0ZWRBdBIWCgZw'
+    'dWJsaWMYCCABKAhSBnB1YmxpYxIxCgZkdWVfYXQYCSABKAsyGi5nb29nbGUucHJvdG9idWYuVG'
+    'ltZXN0YW1wUgVkdWVBdBIdCgpjcmVhdGVkX2J5GAogASgJUgljcmVhdGVkQnkSSAoHcGF0aWVu'
+    'dBgLIAEoCzIuLnNlcnZpY2VzLnRhc2tzX3N2Yy52MS5HZXRUYXNrUmVzcG9uc2UuUGF0aWVudF'
+    'IHcGF0aWVudBpVCgdQYXRpZW50Eg4KAmlkGAEgASgJUgJpZBI6ChlodW1hbl9yZWFkYWJsZV9p'
+    'ZGVudGlmaWVyGAIgASgJUhdodW1hblJlYWRhYmxlSWRlbnRpZmllchpgCgdTdWJUYXNrEg4KAm'
+    'lkGAEgASgJUgJpZBISCgRuYW1lGAIgASgJUgRuYW1lEhIKBGRvbmUYAyABKAhSBGRvbmUSHQoK'
+    'Y3JlYXRlZF9ieRgEIAEoCVIJY3JlYXRlZEJ5QhMKEV9hc3NpZ25lZF91c2VyX2lk');
 
 @$core.Deprecated('Use getTasksByPatientRequestDescriptor instead')
 const GetTasksByPatientRequest$json = {
@@ -326,7 +365,7 @@ const GetAssignedTasksResponse_Task_Patient$json = {
   '1': 'Patient',
   '2': [
     {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
-    {'1': 'name', '3': 2, '4': 1, '5': 9, '10': 'name'},
+    {'1': 'human_readable_identifier', '3': 2, '4': 1, '5': 9, '10': 'humanReadableIdentifier'},
   ],
 };
 
@@ -344,7 +383,7 @@ const GetAssignedTasksResponse_Task_SubTask$json = {
 /// Descriptor for `GetAssignedTasksResponse`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List getAssignedTasksResponseDescriptor = $convert.base64Decode(
     'ChhHZXRBc3NpZ25lZFRhc2tzUmVzcG9uc2USSgoFdGFza3MYASADKAsyNC5zZXJ2aWNlcy50YX'
-    'Nrc19zdmMudjEuR2V0QXNzaWduZWRUYXNrc1Jlc3BvbnNlLlRhc2tSBXRhc2tzGpkFCgRUYXNr'
+    'Nrc19zdmMudjEuR2V0QXNzaWduZWRUYXNrc1Jlc3BvbnNlLlRhc2tSBXRhc2tzGsEFCgRUYXNr'
     'Eg4KAmlkGAEgASgJUgJpZBISCgRuYW1lGAIgASgJUgRuYW1lEiAKC2Rlc2NyaXB0aW9uGAMgAS'
     'gJUgtkZXNjcmlwdGlvbhI5CgZzdGF0dXMYBCABKA4yIS5zZXJ2aWNlcy50YXNrc19zdmMudjEu'
     'VGFza1N0YXR1c1IGc3RhdHVzEigKEGFzc2lnbmVkX3VzZXJfaWQYBSABKAlSDmFzc2lnbmVkVX'
@@ -354,9 +393,10 @@ final $typed_data.Uint8List getAssignedTasksResponseDescriptor = $convert.base64
     'dBIdCgpjcmVhdGVkX2J5GAkgASgJUgljcmVhdGVkQnkSWAoIc3VidGFza3MYCiADKAsyPC5zZX'
     'J2aWNlcy50YXNrc19zdmMudjEuR2V0QXNzaWduZWRUYXNrc1Jlc3BvbnNlLlRhc2suU3ViVGFz'
     'a1IIc3VidGFza3MSOQoKY3JlYXRlZF9hdBgLIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3'
-    'RhbXBSCWNyZWF0ZWRBdBotCgdQYXRpZW50Eg4KAmlkGAEgASgJUgJpZBISCgRuYW1lGAIgASgJ'
-    'UgRuYW1lGmAKB1N1YlRhc2sSDgoCaWQYASABKAlSAmlkEhIKBG5hbWUYAiABKAlSBG5hbWUSEg'
-    'oEZG9uZRgDIAEoCFIEZG9uZRIdCgpjcmVhdGVkX2J5GAQgASgJUgljcmVhdGVkQnk=');
+    'RhbXBSCWNyZWF0ZWRBdBpVCgdQYXRpZW50Eg4KAmlkGAEgASgJUgJpZBI6ChlodW1hbl9yZWFk'
+    'YWJsZV9pZGVudGlmaWVyGAIgASgJUhdodW1hblJlYWRhYmxlSWRlbnRpZmllchpgCgdTdWJUYX'
+    'NrEg4KAmlkGAEgASgJUgJpZBISCgRuYW1lGAIgASgJUgRuYW1lEhIKBGRvbmUYAyABKAhSBGRv'
+    'bmUSHQoKY3JlYXRlZF9ieRgEIAEoCVIJY3JlYXRlZEJ5');
 
 @$core.Deprecated('Use assignTaskRequestDescriptor instead')
 const AssignTaskRequest$json = {
@@ -419,6 +459,7 @@ const CreateSubtaskRequest_Subtask$json = {
   '1': 'Subtask',
   '2': [
     {'1': 'name', '3': 1, '4': 1, '5': 9, '10': 'name'},
+    {'1': 'done', '3': 2, '4': 1, '5': 8, '10': 'done'},
   ],
 };
 
@@ -426,7 +467,8 @@ const CreateSubtaskRequest_Subtask$json = {
 final $typed_data.Uint8List createSubtaskRequestDescriptor = $convert.base64Decode(
     'ChRDcmVhdGVTdWJ0YXNrUmVxdWVzdBIXCgd0YXNrX2lkGAEgASgJUgZ0YXNrSWQSTQoHc3VidG'
     'FzaxgCIAEoCzIzLnNlcnZpY2VzLnRhc2tzX3N2Yy52MS5DcmVhdGVTdWJ0YXNrUmVxdWVzdC5T'
-    'dWJ0YXNrUgdzdWJ0YXNrGh0KB1N1YnRhc2sSEgoEbmFtZRgBIAEoCVIEbmFtZQ==');
+    'dWJ0YXNrUgdzdWJ0YXNrGjEKB1N1YnRhc2sSEgoEbmFtZRgBIAEoCVIEbmFtZRISCgRkb25lGA'
+    'IgASgIUgRkb25l');
 
 @$core.Deprecated('Use createSubtaskResponseDescriptor instead')
 const CreateSubtaskResponse$json = {
@@ -456,9 +498,11 @@ const UpdateSubtaskRequest_Subtask$json = {
   '1': 'Subtask',
   '2': [
     {'1': 'name', '3': 1, '4': 1, '5': 9, '9': 0, '10': 'name', '17': true},
+    {'1': 'done', '3': 2, '4': 1, '5': 8, '9': 1, '10': 'done', '17': true},
   ],
   '8': [
     {'1': '_name'},
+    {'1': '_done'},
   ],
 };
 
@@ -466,8 +510,9 @@ const UpdateSubtaskRequest_Subtask$json = {
 final $typed_data.Uint8List updateSubtaskRequestDescriptor = $convert.base64Decode(
     'ChRVcGRhdGVTdWJ0YXNrUmVxdWVzdBIXCgd0YXNrX2lkGAEgASgJUgZ0YXNrSWQSHQoKc3VidG'
     'Fza19pZBgCIAEoCVIJc3VidGFza0lkEk0KB3N1YnRhc2sYAyABKAsyMy5zZXJ2aWNlcy50YXNr'
-    'c19zdmMudjEuVXBkYXRlU3VidGFza1JlcXVlc3QuU3VidGFza1IHc3VidGFzaxorCgdTdWJ0YX'
-    'NrEhcKBG5hbWUYASABKAlIAFIEbmFtZYgBAUIHCgVfbmFtZQ==');
+    'c19zdmMudjEuVXBkYXRlU3VidGFza1JlcXVlc3QuU3VidGFza1IHc3VidGFzaxpNCgdTdWJ0YX'
+    'NrEhcKBG5hbWUYASABKAlIAFIEbmFtZYgBARIXCgRkb25lGAIgASgISAFSBGRvbmWIAQFCBwoF'
+    'X25hbWVCBwoFX2RvbmU=');
 
 @$core.Deprecated('Use updateSubtaskResponseDescriptor instead')
 const UpdateSubtaskResponse$json = {
@@ -478,72 +523,68 @@ const UpdateSubtaskResponse$json = {
 final $typed_data.Uint8List updateSubtaskResponseDescriptor = $convert.base64Decode(
     'ChVVcGRhdGVTdWJ0YXNrUmVzcG9uc2U=');
 
-@$core.Deprecated('Use completeSubtaskRequestDescriptor instead')
-const CompleteSubtaskRequest$json = {
-  '1': 'CompleteSubtaskRequest',
+@$core.Deprecated('Use deleteSubtaskRequestDescriptor instead')
+const DeleteSubtaskRequest$json = {
+  '1': 'DeleteSubtaskRequest',
   '2': [
     {'1': 'task_id', '3': 1, '4': 1, '5': 9, '10': 'taskId'},
     {'1': 'subtask_id', '3': 2, '4': 1, '5': 9, '10': 'subtaskId'},
   ],
 };
 
-/// Descriptor for `CompleteSubtaskRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List completeSubtaskRequestDescriptor = $convert.base64Decode(
-    'ChZDb21wbGV0ZVN1YnRhc2tSZXF1ZXN0EhcKB3Rhc2tfaWQYASABKAlSBnRhc2tJZBIdCgpzdW'
-    'J0YXNrX2lkGAIgASgJUglzdWJ0YXNrSWQ=');
+/// Descriptor for `DeleteSubtaskRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List deleteSubtaskRequestDescriptor = $convert.base64Decode(
+    'ChREZWxldGVTdWJ0YXNrUmVxdWVzdBIXCgd0YXNrX2lkGAEgASgJUgZ0YXNrSWQSHQoKc3VidG'
+    'Fza19pZBgCIAEoCVIJc3VidGFza0lk');
 
-@$core.Deprecated('Use completeSubtaskResponseDescriptor instead')
-const CompleteSubtaskResponse$json = {
-  '1': 'CompleteSubtaskResponse',
+@$core.Deprecated('Use deleteSubtaskResponseDescriptor instead')
+const DeleteSubtaskResponse$json = {
+  '1': 'DeleteSubtaskResponse',
 };
 
-/// Descriptor for `CompleteSubtaskResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List completeSubtaskResponseDescriptor = $convert.base64Decode(
-    'ChdDb21wbGV0ZVN1YnRhc2tSZXNwb25zZQ==');
+/// Descriptor for `DeleteSubtaskResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List deleteSubtaskResponseDescriptor = $convert.base64Decode(
+    'ChVEZWxldGVTdWJ0YXNrUmVzcG9uc2U=');
 
-@$core.Deprecated('Use uncompleteSubtaskRequestDescriptor instead')
-const UncompleteSubtaskRequest$json = {
-  '1': 'UncompleteSubtaskRequest',
+@$core.Deprecated('Use removeTaskDueDateRequestDescriptor instead')
+const RemoveTaskDueDateRequest$json = {
+  '1': 'RemoveTaskDueDateRequest',
   '2': [
     {'1': 'task_id', '3': 1, '4': 1, '5': 9, '10': 'taskId'},
-    {'1': 'subtask_id', '3': 2, '4': 1, '5': 9, '10': 'subtaskId'},
   ],
 };
 
-/// Descriptor for `UncompleteSubtaskRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List uncompleteSubtaskRequestDescriptor = $convert.base64Decode(
-    'ChhVbmNvbXBsZXRlU3VidGFza1JlcXVlc3QSFwoHdGFza19pZBgBIAEoCVIGdGFza0lkEh0KCn'
-    'N1YnRhc2tfaWQYAiABKAlSCXN1YnRhc2tJZA==');
+/// Descriptor for `RemoveTaskDueDateRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List removeTaskDueDateRequestDescriptor = $convert.base64Decode(
+    'ChhSZW1vdmVUYXNrRHVlRGF0ZVJlcXVlc3QSFwoHdGFza19pZBgBIAEoCVIGdGFza0lk');
 
-@$core.Deprecated('Use uncompleteSubtaskResponseDescriptor instead')
-const UncompleteSubtaskResponse$json = {
-  '1': 'UncompleteSubtaskResponse',
+@$core.Deprecated('Use removeTaskDueDateResponseDescriptor instead')
+const RemoveTaskDueDateResponse$json = {
+  '1': 'RemoveTaskDueDateResponse',
 };
 
-/// Descriptor for `UncompleteSubtaskResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List uncompleteSubtaskResponseDescriptor = $convert.base64Decode(
-    'ChlVbmNvbXBsZXRlU3VidGFza1Jlc3BvbnNl');
+/// Descriptor for `RemoveTaskDueDateResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List removeTaskDueDateResponseDescriptor = $convert.base64Decode(
+    'ChlSZW1vdmVUYXNrRHVlRGF0ZVJlc3BvbnNl');
 
-@$core.Deprecated('Use deleteSubtaskRequestDescriptor instead')
-const DeleteSubtaskRequest$json = {
-  '1': 'DeleteSubtaskRequest',
+@$core.Deprecated('Use deleteTaskRequestDescriptor instead')
+const DeleteTaskRequest$json = {
+  '1': 'DeleteTaskRequest',
   '2': [
-    {'1': 'task_id', '3': 1, '4': 1, '5': 9, '10': 'taskId'},
-    {'1': 'subtask_id', '3': 2, '4': 1, '5': 9, '10': 'subtaskId'},
+    {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
   ],
 };
 
-/// Descriptor for `DeleteSubtaskRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List deleteSubtaskRequestDescriptor = $convert.base64Decode(
-    'ChREZWxldGVTdWJ0YXNrUmVxdWVzdBIXCgd0YXNrX2lkGAEgASgJUgZ0YXNrSWQSHQoKc3VidG'
-    'Fza19pZBgCIAEoCVIJc3VidGFza0lk');
+/// Descriptor for `DeleteTaskRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List deleteTaskRequestDescriptor = $convert.base64Decode(
+    'ChFEZWxldGVUYXNrUmVxdWVzdBIOCgJpZBgBIAEoCVICaWQ=');
 
-@$core.Deprecated('Use deleteSubtaskResponseDescriptor instead')
-const DeleteSubtaskResponse$json = {
-  '1': 'DeleteSubtaskResponse',
+@$core.Deprecated('Use deleteTaskResponseDescriptor instead')
+const DeleteTaskResponse$json = {
+  '1': 'DeleteTaskResponse',
 };
 
-/// Descriptor for `DeleteSubtaskResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List deleteSubtaskResponseDescriptor = $convert.base64Decode(
-    'ChVEZWxldGVTdWJ0YXNrUmVzcG9uc2U=');
+/// Descriptor for `DeleteTaskResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List deleteTaskResponseDescriptor = $convert.base64Decode(
+    'ChJEZWxldGVUYXNrUmVzcG9uc2U=');
 
diff --git a/gen/dart/lib/services/tasks_svc/v1/task_template_svc.pb.dart b/gen/dart/lib/services/tasks_svc/v1/task_template_svc.pb.dart
index 030e8cc0c..bc5b822db 100644
--- a/gen/dart/lib/services/tasks_svc/v1/task_template_svc.pb.dart
+++ b/gen/dart/lib/services/tasks_svc/v1/task_template_svc.pb.dart
@@ -199,274 +199,6 @@ class CreateTaskTemplateResponse extends $pb.GeneratedMessage {
   void clearId() => clearField(1);
 }
 
-class GetAllTaskTemplatesRequest extends $pb.GeneratedMessage {
-  factory GetAllTaskTemplatesRequest() => create();
-  GetAllTaskTemplatesRequest._() : super();
-  factory GetAllTaskTemplatesRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetAllTaskTemplatesRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAllTaskTemplatesRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetAllTaskTemplatesRequest clone() => GetAllTaskTemplatesRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetAllTaskTemplatesRequest copyWith(void Function(GetAllTaskTemplatesRequest) updates) => super.copyWith((message) => updates(message as GetAllTaskTemplatesRequest)) as GetAllTaskTemplatesRequest;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesRequest create() => GetAllTaskTemplatesRequest._();
-  GetAllTaskTemplatesRequest createEmptyInstance() => create();
-  static $pb.PbList<GetAllTaskTemplatesRequest> createRepeated() => $pb.PbList<GetAllTaskTemplatesRequest>();
-  @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetAllTaskTemplatesRequest>(create);
-  static GetAllTaskTemplatesRequest? _defaultInstance;
-}
-
-class GetAllTaskTemplatesResponse_TaskTemplate_SubTask extends $pb.GeneratedMessage {
-  factory GetAllTaskTemplatesResponse_TaskTemplate_SubTask({
-    $core.String? id,
-    $core.String? taskTemplateId,
-    $core.String? name,
-  }) {
-    final $result = create();
-    if (id != null) {
-      $result.id = id;
-    }
-    if (taskTemplateId != null) {
-      $result.taskTemplateId = taskTemplateId;
-    }
-    if (name != null) {
-      $result.name = name;
-    }
-    return $result;
-  }
-  GetAllTaskTemplatesResponse_TaskTemplate_SubTask._() : super();
-  factory GetAllTaskTemplatesResponse_TaskTemplate_SubTask.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetAllTaskTemplatesResponse_TaskTemplate_SubTask.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAllTaskTemplatesResponse.TaskTemplate.SubTask', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'id')
-    ..aOS(2, _omitFieldNames ? '' : 'taskTemplateId')
-    ..aOS(3, _omitFieldNames ? '' : 'name')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetAllTaskTemplatesResponse_TaskTemplate_SubTask clone() => GetAllTaskTemplatesResponse_TaskTemplate_SubTask()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetAllTaskTemplatesResponse_TaskTemplate_SubTask copyWith(void Function(GetAllTaskTemplatesResponse_TaskTemplate_SubTask) updates) => super.copyWith((message) => updates(message as GetAllTaskTemplatesResponse_TaskTemplate_SubTask)) as GetAllTaskTemplatesResponse_TaskTemplate_SubTask;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesResponse_TaskTemplate_SubTask create() => GetAllTaskTemplatesResponse_TaskTemplate_SubTask._();
-  GetAllTaskTemplatesResponse_TaskTemplate_SubTask createEmptyInstance() => create();
-  static $pb.PbList<GetAllTaskTemplatesResponse_TaskTemplate_SubTask> createRepeated() => $pb.PbList<GetAllTaskTemplatesResponse_TaskTemplate_SubTask>();
-  @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesResponse_TaskTemplate_SubTask getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetAllTaskTemplatesResponse_TaskTemplate_SubTask>(create);
-  static GetAllTaskTemplatesResponse_TaskTemplate_SubTask? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.String get id => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set id($core.String v) { $_setString(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasId() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearId() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.String get taskTemplateId => $_getSZ(1);
-  @$pb.TagNumber(2)
-  set taskTemplateId($core.String v) { $_setString(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasTaskTemplateId() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearTaskTemplateId() => clearField(2);
-
-  @$pb.TagNumber(3)
-  $core.String get name => $_getSZ(2);
-  @$pb.TagNumber(3)
-  set name($core.String v) { $_setString(2, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasName() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearName() => clearField(3);
-}
-
-class GetAllTaskTemplatesResponse_TaskTemplate extends $pb.GeneratedMessage {
-  factory GetAllTaskTemplatesResponse_TaskTemplate({
-    $core.String? id,
-    $core.String? name,
-    $core.String? description,
-    $core.bool? isPublic,
-    $core.String? createdBy,
-    $core.Iterable<GetAllTaskTemplatesResponse_TaskTemplate_SubTask>? subtasks,
-  }) {
-    final $result = create();
-    if (id != null) {
-      $result.id = id;
-    }
-    if (name != null) {
-      $result.name = name;
-    }
-    if (description != null) {
-      $result.description = description;
-    }
-    if (isPublic != null) {
-      $result.isPublic = isPublic;
-    }
-    if (createdBy != null) {
-      $result.createdBy = createdBy;
-    }
-    if (subtasks != null) {
-      $result.subtasks.addAll(subtasks);
-    }
-    return $result;
-  }
-  GetAllTaskTemplatesResponse_TaskTemplate._() : super();
-  factory GetAllTaskTemplatesResponse_TaskTemplate.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetAllTaskTemplatesResponse_TaskTemplate.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAllTaskTemplatesResponse.TaskTemplate', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'id')
-    ..aOS(2, _omitFieldNames ? '' : 'name')
-    ..aOS(3, _omitFieldNames ? '' : 'description')
-    ..aOB(4, _omitFieldNames ? '' : 'isPublic')
-    ..aOS(6, _omitFieldNames ? '' : 'createdBy')
-    ..pc<GetAllTaskTemplatesResponse_TaskTemplate_SubTask>(7, _omitFieldNames ? '' : 'subtasks', $pb.PbFieldType.PM, subBuilder: GetAllTaskTemplatesResponse_TaskTemplate_SubTask.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetAllTaskTemplatesResponse_TaskTemplate clone() => GetAllTaskTemplatesResponse_TaskTemplate()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetAllTaskTemplatesResponse_TaskTemplate copyWith(void Function(GetAllTaskTemplatesResponse_TaskTemplate) updates) => super.copyWith((message) => updates(message as GetAllTaskTemplatesResponse_TaskTemplate)) as GetAllTaskTemplatesResponse_TaskTemplate;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesResponse_TaskTemplate create() => GetAllTaskTemplatesResponse_TaskTemplate._();
-  GetAllTaskTemplatesResponse_TaskTemplate createEmptyInstance() => create();
-  static $pb.PbList<GetAllTaskTemplatesResponse_TaskTemplate> createRepeated() => $pb.PbList<GetAllTaskTemplatesResponse_TaskTemplate>();
-  @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesResponse_TaskTemplate getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetAllTaskTemplatesResponse_TaskTemplate>(create);
-  static GetAllTaskTemplatesResponse_TaskTemplate? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.String get id => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set id($core.String v) { $_setString(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasId() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearId() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.String get name => $_getSZ(1);
-  @$pb.TagNumber(2)
-  set name($core.String v) { $_setString(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasName() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearName() => clearField(2);
-
-  @$pb.TagNumber(3)
-  $core.String get description => $_getSZ(2);
-  @$pb.TagNumber(3)
-  set description($core.String v) { $_setString(2, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasDescription() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearDescription() => clearField(3);
-
-  @$pb.TagNumber(4)
-  $core.bool get isPublic => $_getBF(3);
-  @$pb.TagNumber(4)
-  set isPublic($core.bool v) { $_setBool(3, v); }
-  @$pb.TagNumber(4)
-  $core.bool hasIsPublic() => $_has(3);
-  @$pb.TagNumber(4)
-  void clearIsPublic() => clearField(4);
-
-  @$pb.TagNumber(6)
-  $core.String get createdBy => $_getSZ(4);
-  @$pb.TagNumber(6)
-  set createdBy($core.String v) { $_setString(4, v); }
-  @$pb.TagNumber(6)
-  $core.bool hasCreatedBy() => $_has(4);
-  @$pb.TagNumber(6)
-  void clearCreatedBy() => clearField(6);
-
-  @$pb.TagNumber(7)
-  $core.List<GetAllTaskTemplatesResponse_TaskTemplate_SubTask> get subtasks => $_getList(5);
-}
-
-class GetAllTaskTemplatesResponse extends $pb.GeneratedMessage {
-  factory GetAllTaskTemplatesResponse({
-    $core.Iterable<GetAllTaskTemplatesResponse_TaskTemplate>? templates,
-  }) {
-    final $result = create();
-    if (templates != null) {
-      $result.templates.addAll(templates);
-    }
-    return $result;
-  }
-  GetAllTaskTemplatesResponse._() : super();
-  factory GetAllTaskTemplatesResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetAllTaskTemplatesResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAllTaskTemplatesResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
-    ..pc<GetAllTaskTemplatesResponse_TaskTemplate>(1, _omitFieldNames ? '' : 'templates', $pb.PbFieldType.PM, subBuilder: GetAllTaskTemplatesResponse_TaskTemplate.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetAllTaskTemplatesResponse clone() => GetAllTaskTemplatesResponse()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetAllTaskTemplatesResponse copyWith(void Function(GetAllTaskTemplatesResponse) updates) => super.copyWith((message) => updates(message as GetAllTaskTemplatesResponse)) as GetAllTaskTemplatesResponse;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesResponse create() => GetAllTaskTemplatesResponse._();
-  GetAllTaskTemplatesResponse createEmptyInstance() => create();
-  static $pb.PbList<GetAllTaskTemplatesResponse> createRepeated() => $pb.PbList<GetAllTaskTemplatesResponse>();
-  @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetAllTaskTemplatesResponse>(create);
-  static GetAllTaskTemplatesResponse? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.List<GetAllTaskTemplatesResponse_TaskTemplate> get templates => $_getList(0);
-}
-
 class DeleteTaskTemplateRequest extends $pb.GeneratedMessage {
   factory DeleteTaskTemplateRequest({
     $core.String? id,
@@ -740,238 +472,28 @@ class UpdateTaskTemplateResponse extends $pb.GeneratedMessage {
   static UpdateTaskTemplateResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<UpdateTaskTemplateResponse>(create);
   static UpdateTaskTemplateResponse? _defaultInstance;
 }
-
-class UpdateTaskTemplateSubTaskRequest extends $pb.GeneratedMessage {
-  factory UpdateTaskTemplateSubTaskRequest({
-    $core.String? subtaskId,
-    $core.String? name,
-  }) {
-    final $result = create();
-    if (subtaskId != null) {
-      $result.subtaskId = subtaskId;
-    }
-    if (name != null) {
-      $result.name = name;
-    }
-    return $result;
-  }
-  UpdateTaskTemplateSubTaskRequest._() : super();
-  factory UpdateTaskTemplateSubTaskRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory UpdateTaskTemplateSubTaskRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UpdateTaskTemplateSubTaskRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'subtaskId')
-    ..aOS(2, _omitFieldNames ? '' : 'name')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  UpdateTaskTemplateSubTaskRequest clone() => UpdateTaskTemplateSubTaskRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  UpdateTaskTemplateSubTaskRequest copyWith(void Function(UpdateTaskTemplateSubTaskRequest) updates) => super.copyWith((message) => updates(message as UpdateTaskTemplateSubTaskRequest)) as UpdateTaskTemplateSubTaskRequest;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static UpdateTaskTemplateSubTaskRequest create() => UpdateTaskTemplateSubTaskRequest._();
-  UpdateTaskTemplateSubTaskRequest createEmptyInstance() => create();
-  static $pb.PbList<UpdateTaskTemplateSubTaskRequest> createRepeated() => $pb.PbList<UpdateTaskTemplateSubTaskRequest>();
-  @$core.pragma('dart2js:noInline')
-  static UpdateTaskTemplateSubTaskRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<UpdateTaskTemplateSubTaskRequest>(create);
-  static UpdateTaskTemplateSubTaskRequest? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.String get subtaskId => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set subtaskId($core.String v) { $_setString(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasSubtaskId() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearSubtaskId() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.String get name => $_getSZ(1);
-  @$pb.TagNumber(2)
-  set name($core.String v) { $_setString(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasName() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearName() => clearField(2);
-}
-
-class UpdateTaskTemplateSubTaskResponse extends $pb.GeneratedMessage {
-  factory UpdateTaskTemplateSubTaskResponse() => create();
-  UpdateTaskTemplateSubTaskResponse._() : super();
-  factory UpdateTaskTemplateSubTaskResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory UpdateTaskTemplateSubTaskResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UpdateTaskTemplateSubTaskResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  UpdateTaskTemplateSubTaskResponse clone() => UpdateTaskTemplateSubTaskResponse()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  UpdateTaskTemplateSubTaskResponse copyWith(void Function(UpdateTaskTemplateSubTaskResponse) updates) => super.copyWith((message) => updates(message as UpdateTaskTemplateSubTaskResponse)) as UpdateTaskTemplateSubTaskResponse;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static UpdateTaskTemplateSubTaskResponse create() => UpdateTaskTemplateSubTaskResponse._();
-  UpdateTaskTemplateSubTaskResponse createEmptyInstance() => create();
-  static $pb.PbList<UpdateTaskTemplateSubTaskResponse> createRepeated() => $pb.PbList<UpdateTaskTemplateSubTaskResponse>();
-  @$core.pragma('dart2js:noInline')
-  static UpdateTaskTemplateSubTaskResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<UpdateTaskTemplateSubTaskResponse>(create);
-  static UpdateTaskTemplateSubTaskResponse? _defaultInstance;
-}
-
-class CreateTaskTemplateSubTaskRequest extends $pb.GeneratedMessage {
-  factory CreateTaskTemplateSubTaskRequest({
-    $core.String? taskTemplateId,
-    $core.String? name,
-  }) {
-    final $result = create();
-    if (taskTemplateId != null) {
-      $result.taskTemplateId = taskTemplateId;
-    }
-    if (name != null) {
-      $result.name = name;
-    }
-    return $result;
-  }
-  CreateTaskTemplateSubTaskRequest._() : super();
-  factory CreateTaskTemplateSubTaskRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory CreateTaskTemplateSubTaskRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateTaskTemplateSubTaskRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'taskTemplateId')
-    ..aOS(2, _omitFieldNames ? '' : 'name')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  CreateTaskTemplateSubTaskRequest clone() => CreateTaskTemplateSubTaskRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  CreateTaskTemplateSubTaskRequest copyWith(void Function(CreateTaskTemplateSubTaskRequest) updates) => super.copyWith((message) => updates(message as CreateTaskTemplateSubTaskRequest)) as CreateTaskTemplateSubTaskRequest;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static CreateTaskTemplateSubTaskRequest create() => CreateTaskTemplateSubTaskRequest._();
-  CreateTaskTemplateSubTaskRequest createEmptyInstance() => create();
-  static $pb.PbList<CreateTaskTemplateSubTaskRequest> createRepeated() => $pb.PbList<CreateTaskTemplateSubTaskRequest>();
-  @$core.pragma('dart2js:noInline')
-  static CreateTaskTemplateSubTaskRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CreateTaskTemplateSubTaskRequest>(create);
-  static CreateTaskTemplateSubTaskRequest? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.String get taskTemplateId => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set taskTemplateId($core.String v) { $_setString(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasTaskTemplateId() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearTaskTemplateId() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.String get name => $_getSZ(1);
-  @$pb.TagNumber(2)
-  set name($core.String v) { $_setString(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasName() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearName() => clearField(2);
-}
-
-class CreateTaskTemplateSubTaskResponse extends $pb.GeneratedMessage {
-  factory CreateTaskTemplateSubTaskResponse({
-    $core.String? id,
-  }) {
-    final $result = create();
-    if (id != null) {
-      $result.id = id;
-    }
-    return $result;
-  }
-  CreateTaskTemplateSubTaskResponse._() : super();
-  factory CreateTaskTemplateSubTaskResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory CreateTaskTemplateSubTaskResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateTaskTemplateSubTaskResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'id')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  CreateTaskTemplateSubTaskResponse clone() => CreateTaskTemplateSubTaskResponse()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  CreateTaskTemplateSubTaskResponse copyWith(void Function(CreateTaskTemplateSubTaskResponse) updates) => super.copyWith((message) => updates(message as CreateTaskTemplateSubTaskResponse)) as CreateTaskTemplateSubTaskResponse;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static CreateTaskTemplateSubTaskResponse create() => CreateTaskTemplateSubTaskResponse._();
-  CreateTaskTemplateSubTaskResponse createEmptyInstance() => create();
-  static $pb.PbList<CreateTaskTemplateSubTaskResponse> createRepeated() => $pb.PbList<CreateTaskTemplateSubTaskResponse>();
-  @$core.pragma('dart2js:noInline')
-  static CreateTaskTemplateSubTaskResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CreateTaskTemplateSubTaskResponse>(create);
-  static CreateTaskTemplateSubTaskResponse? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.String get id => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set id($core.String v) { $_setString(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasId() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearId() => clearField(1);
-}
-
-class GetAllTaskTemplatesByCreatorRequest extends $pb.GeneratedMessage {
-  factory GetAllTaskTemplatesByCreatorRequest({
-    $core.String? createdBy,
-    $core.bool? privateOnly,
+
+class UpdateTaskTemplateSubTaskRequest extends $pb.GeneratedMessage {
+  factory UpdateTaskTemplateSubTaskRequest({
+    $core.String? subtaskId,
+    $core.String? name,
   }) {
     final $result = create();
-    if (createdBy != null) {
-      $result.createdBy = createdBy;
+    if (subtaskId != null) {
+      $result.subtaskId = subtaskId;
     }
-    if (privateOnly != null) {
-      $result.privateOnly = privateOnly;
+    if (name != null) {
+      $result.name = name;
     }
     return $result;
   }
-  GetAllTaskTemplatesByCreatorRequest._() : super();
-  factory GetAllTaskTemplatesByCreatorRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetAllTaskTemplatesByCreatorRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  UpdateTaskTemplateSubTaskRequest._() : super();
+  factory UpdateTaskTemplateSubTaskRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory UpdateTaskTemplateSubTaskRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAllTaskTemplatesByCreatorRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'createdBy')
-    ..aOB(2, _omitFieldNames ? '' : 'privateOnly')
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UpdateTaskTemplateSubTaskRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'subtaskId')
+    ..aOS(2, _omitFieldNames ? '' : 'name')
     ..hasRequiredFields = false
   ;
 
@@ -979,68 +501,49 @@ class GetAllTaskTemplatesByCreatorRequest extends $pb.GeneratedMessage {
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  GetAllTaskTemplatesByCreatorRequest clone() => GetAllTaskTemplatesByCreatorRequest()..mergeFromMessage(this);
+  UpdateTaskTemplateSubTaskRequest clone() => UpdateTaskTemplateSubTaskRequest()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  GetAllTaskTemplatesByCreatorRequest copyWith(void Function(GetAllTaskTemplatesByCreatorRequest) updates) => super.copyWith((message) => updates(message as GetAllTaskTemplatesByCreatorRequest)) as GetAllTaskTemplatesByCreatorRequest;
+  UpdateTaskTemplateSubTaskRequest copyWith(void Function(UpdateTaskTemplateSubTaskRequest) updates) => super.copyWith((message) => updates(message as UpdateTaskTemplateSubTaskRequest)) as UpdateTaskTemplateSubTaskRequest;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesByCreatorRequest create() => GetAllTaskTemplatesByCreatorRequest._();
-  GetAllTaskTemplatesByCreatorRequest createEmptyInstance() => create();
-  static $pb.PbList<GetAllTaskTemplatesByCreatorRequest> createRepeated() => $pb.PbList<GetAllTaskTemplatesByCreatorRequest>();
+  static UpdateTaskTemplateSubTaskRequest create() => UpdateTaskTemplateSubTaskRequest._();
+  UpdateTaskTemplateSubTaskRequest createEmptyInstance() => create();
+  static $pb.PbList<UpdateTaskTemplateSubTaskRequest> createRepeated() => $pb.PbList<UpdateTaskTemplateSubTaskRequest>();
   @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesByCreatorRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetAllTaskTemplatesByCreatorRequest>(create);
-  static GetAllTaskTemplatesByCreatorRequest? _defaultInstance;
+  static UpdateTaskTemplateSubTaskRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<UpdateTaskTemplateSubTaskRequest>(create);
+  static UpdateTaskTemplateSubTaskRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.String get createdBy => $_getSZ(0);
+  $core.String get subtaskId => $_getSZ(0);
   @$pb.TagNumber(1)
-  set createdBy($core.String v) { $_setString(0, v); }
+  set subtaskId($core.String v) { $_setString(0, v); }
   @$pb.TagNumber(1)
-  $core.bool hasCreatedBy() => $_has(0);
+  $core.bool hasSubtaskId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearCreatedBy() => clearField(1);
+  void clearSubtaskId() => clearField(1);
 
   @$pb.TagNumber(2)
-  $core.bool get privateOnly => $_getBF(1);
+  $core.String get name => $_getSZ(1);
   @$pb.TagNumber(2)
-  set privateOnly($core.bool v) { $_setBool(1, v); }
+  set name($core.String v) { $_setString(1, v); }
   @$pb.TagNumber(2)
-  $core.bool hasPrivateOnly() => $_has(1);
+  $core.bool hasName() => $_has(1);
   @$pb.TagNumber(2)
-  void clearPrivateOnly() => clearField(2);
+  void clearName() => clearField(2);
 }
 
-class GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask extends $pb.GeneratedMessage {
-  factory GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask({
-    $core.String? id,
-    $core.String? taskTemplateId,
-    $core.String? name,
-  }) {
-    final $result = create();
-    if (id != null) {
-      $result.id = id;
-    }
-    if (taskTemplateId != null) {
-      $result.taskTemplateId = taskTemplateId;
-    }
-    if (name != null) {
-      $result.name = name;
-    }
-    return $result;
-  }
-  GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask._() : super();
-  factory GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+class UpdateTaskTemplateSubTaskResponse extends $pb.GeneratedMessage {
+  factory UpdateTaskTemplateSubTaskResponse() => create();
+  UpdateTaskTemplateSubTaskResponse._() : super();
+  factory UpdateTaskTemplateSubTaskResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory UpdateTaskTemplateSubTaskResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'id')
-    ..aOS(2, _omitFieldNames ? '' : 'taskTemplateId')
-    ..aOS(3, _omitFieldNames ? '' : 'name')
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UpdateTaskTemplateSubTaskResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
     ..hasRequiredFields = false
   ;
 
@@ -1048,87 +551,45 @@ class GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask extends $pb.Gene
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask clone() => GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask()..mergeFromMessage(this);
+  UpdateTaskTemplateSubTaskResponse clone() => UpdateTaskTemplateSubTaskResponse()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask copyWith(void Function(GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask) updates) => super.copyWith((message) => updates(message as GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask)) as GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask;
+  UpdateTaskTemplateSubTaskResponse copyWith(void Function(UpdateTaskTemplateSubTaskResponse) updates) => super.copyWith((message) => updates(message as UpdateTaskTemplateSubTaskResponse)) as UpdateTaskTemplateSubTaskResponse;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask create() => GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask._();
-  GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask createEmptyInstance() => create();
-  static $pb.PbList<GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask> createRepeated() => $pb.PbList<GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask>();
+  static UpdateTaskTemplateSubTaskResponse create() => UpdateTaskTemplateSubTaskResponse._();
+  UpdateTaskTemplateSubTaskResponse createEmptyInstance() => create();
+  static $pb.PbList<UpdateTaskTemplateSubTaskResponse> createRepeated() => $pb.PbList<UpdateTaskTemplateSubTaskResponse>();
   @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask>(create);
-  static GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.String get id => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set id($core.String v) { $_setString(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasId() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearId() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.String get taskTemplateId => $_getSZ(1);
-  @$pb.TagNumber(2)
-  set taskTemplateId($core.String v) { $_setString(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasTaskTemplateId() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearTaskTemplateId() => clearField(2);
-
-  @$pb.TagNumber(3)
-  $core.String get name => $_getSZ(2);
-  @$pb.TagNumber(3)
-  set name($core.String v) { $_setString(2, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasName() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearName() => clearField(3);
+  static UpdateTaskTemplateSubTaskResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<UpdateTaskTemplateSubTaskResponse>(create);
+  static UpdateTaskTemplateSubTaskResponse? _defaultInstance;
 }
 
-class GetAllTaskTemplatesByCreatorResponse_TaskTemplate extends $pb.GeneratedMessage {
-  factory GetAllTaskTemplatesByCreatorResponse_TaskTemplate({
-    $core.String? id,
+class CreateTaskTemplateSubTaskRequest extends $pb.GeneratedMessage {
+  factory CreateTaskTemplateSubTaskRequest({
+    $core.String? taskTemplateId,
     $core.String? name,
-    $core.String? description,
-    $core.bool? isPublic,
-    $core.Iterable<GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask>? subtasks,
   }) {
     final $result = create();
-    if (id != null) {
-      $result.id = id;
+    if (taskTemplateId != null) {
+      $result.taskTemplateId = taskTemplateId;
     }
     if (name != null) {
       $result.name = name;
     }
-    if (description != null) {
-      $result.description = description;
-    }
-    if (isPublic != null) {
-      $result.isPublic = isPublic;
-    }
-    if (subtasks != null) {
-      $result.subtasks.addAll(subtasks);
-    }
     return $result;
   }
-  GetAllTaskTemplatesByCreatorResponse_TaskTemplate._() : super();
-  factory GetAllTaskTemplatesByCreatorResponse_TaskTemplate.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetAllTaskTemplatesByCreatorResponse_TaskTemplate.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  CreateTaskTemplateSubTaskRequest._() : super();
+  factory CreateTaskTemplateSubTaskRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory CreateTaskTemplateSubTaskRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAllTaskTemplatesByCreatorResponse.TaskTemplate', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'id')
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateTaskTemplateSubTaskRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'taskTemplateId')
     ..aOS(2, _omitFieldNames ? '' : 'name')
-    ..aOS(3, _omitFieldNames ? '' : 'description')
-    ..aOB(4, _omitFieldNames ? '' : 'isPublic')
-    ..pc<GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask>(7, _omitFieldNames ? '' : 'subtasks', $pb.PbFieldType.PM, subBuilder: GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask.create)
     ..hasRequiredFields = false
   ;
 
@@ -1136,31 +597,31 @@ class GetAllTaskTemplatesByCreatorResponse_TaskTemplate extends $pb.GeneratedMes
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  GetAllTaskTemplatesByCreatorResponse_TaskTemplate clone() => GetAllTaskTemplatesByCreatorResponse_TaskTemplate()..mergeFromMessage(this);
+  CreateTaskTemplateSubTaskRequest clone() => CreateTaskTemplateSubTaskRequest()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  GetAllTaskTemplatesByCreatorResponse_TaskTemplate copyWith(void Function(GetAllTaskTemplatesByCreatorResponse_TaskTemplate) updates) => super.copyWith((message) => updates(message as GetAllTaskTemplatesByCreatorResponse_TaskTemplate)) as GetAllTaskTemplatesByCreatorResponse_TaskTemplate;
+  CreateTaskTemplateSubTaskRequest copyWith(void Function(CreateTaskTemplateSubTaskRequest) updates) => super.copyWith((message) => updates(message as CreateTaskTemplateSubTaskRequest)) as CreateTaskTemplateSubTaskRequest;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesByCreatorResponse_TaskTemplate create() => GetAllTaskTemplatesByCreatorResponse_TaskTemplate._();
-  GetAllTaskTemplatesByCreatorResponse_TaskTemplate createEmptyInstance() => create();
-  static $pb.PbList<GetAllTaskTemplatesByCreatorResponse_TaskTemplate> createRepeated() => $pb.PbList<GetAllTaskTemplatesByCreatorResponse_TaskTemplate>();
+  static CreateTaskTemplateSubTaskRequest create() => CreateTaskTemplateSubTaskRequest._();
+  CreateTaskTemplateSubTaskRequest createEmptyInstance() => create();
+  static $pb.PbList<CreateTaskTemplateSubTaskRequest> createRepeated() => $pb.PbList<CreateTaskTemplateSubTaskRequest>();
   @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesByCreatorResponse_TaskTemplate getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetAllTaskTemplatesByCreatorResponse_TaskTemplate>(create);
-  static GetAllTaskTemplatesByCreatorResponse_TaskTemplate? _defaultInstance;
+  static CreateTaskTemplateSubTaskRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CreateTaskTemplateSubTaskRequest>(create);
+  static CreateTaskTemplateSubTaskRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.String get id => $_getSZ(0);
+  $core.String get taskTemplateId => $_getSZ(0);
   @$pb.TagNumber(1)
-  set id($core.String v) { $_setString(0, v); }
+  set taskTemplateId($core.String v) { $_setString(0, v); }
   @$pb.TagNumber(1)
-  $core.bool hasId() => $_has(0);
+  $core.bool hasTaskTemplateId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearId() => clearField(1);
+  void clearTaskTemplateId() => clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get name => $_getSZ(1);
@@ -1170,45 +631,24 @@ class GetAllTaskTemplatesByCreatorResponse_TaskTemplate extends $pb.GeneratedMes
   $core.bool hasName() => $_has(1);
   @$pb.TagNumber(2)
   void clearName() => clearField(2);
-
-  @$pb.TagNumber(3)
-  $core.String get description => $_getSZ(2);
-  @$pb.TagNumber(3)
-  set description($core.String v) { $_setString(2, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasDescription() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearDescription() => clearField(3);
-
-  @$pb.TagNumber(4)
-  $core.bool get isPublic => $_getBF(3);
-  @$pb.TagNumber(4)
-  set isPublic($core.bool v) { $_setBool(3, v); }
-  @$pb.TagNumber(4)
-  $core.bool hasIsPublic() => $_has(3);
-  @$pb.TagNumber(4)
-  void clearIsPublic() => clearField(4);
-
-  @$pb.TagNumber(7)
-  $core.List<GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask> get subtasks => $_getList(4);
 }
 
-class GetAllTaskTemplatesByCreatorResponse extends $pb.GeneratedMessage {
-  factory GetAllTaskTemplatesByCreatorResponse({
-    $core.Iterable<GetAllTaskTemplatesByCreatorResponse_TaskTemplate>? templates,
+class CreateTaskTemplateSubTaskResponse extends $pb.GeneratedMessage {
+  factory CreateTaskTemplateSubTaskResponse({
+    $core.String? id,
   }) {
     final $result = create();
-    if (templates != null) {
-      $result.templates.addAll(templates);
+    if (id != null) {
+      $result.id = id;
     }
     return $result;
   }
-  GetAllTaskTemplatesByCreatorResponse._() : super();
-  factory GetAllTaskTemplatesByCreatorResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetAllTaskTemplatesByCreatorResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  CreateTaskTemplateSubTaskResponse._() : super();
+  factory CreateTaskTemplateSubTaskResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory CreateTaskTemplateSubTaskResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAllTaskTemplatesByCreatorResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
-    ..pc<GetAllTaskTemplatesByCreatorResponse_TaskTemplate>(1, _omitFieldNames ? '' : 'templates', $pb.PbFieldType.PM, subBuilder: GetAllTaskTemplatesByCreatorResponse_TaskTemplate.create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateTaskTemplateSubTaskResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'id')
     ..hasRequiredFields = false
   ;
 
@@ -1216,43 +656,59 @@ class GetAllTaskTemplatesByCreatorResponse extends $pb.GeneratedMessage {
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  GetAllTaskTemplatesByCreatorResponse clone() => GetAllTaskTemplatesByCreatorResponse()..mergeFromMessage(this);
+  CreateTaskTemplateSubTaskResponse clone() => CreateTaskTemplateSubTaskResponse()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  GetAllTaskTemplatesByCreatorResponse copyWith(void Function(GetAllTaskTemplatesByCreatorResponse) updates) => super.copyWith((message) => updates(message as GetAllTaskTemplatesByCreatorResponse)) as GetAllTaskTemplatesByCreatorResponse;
+  CreateTaskTemplateSubTaskResponse copyWith(void Function(CreateTaskTemplateSubTaskResponse) updates) => super.copyWith((message) => updates(message as CreateTaskTemplateSubTaskResponse)) as CreateTaskTemplateSubTaskResponse;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesByCreatorResponse create() => GetAllTaskTemplatesByCreatorResponse._();
-  GetAllTaskTemplatesByCreatorResponse createEmptyInstance() => create();
-  static $pb.PbList<GetAllTaskTemplatesByCreatorResponse> createRepeated() => $pb.PbList<GetAllTaskTemplatesByCreatorResponse>();
+  static CreateTaskTemplateSubTaskResponse create() => CreateTaskTemplateSubTaskResponse._();
+  CreateTaskTemplateSubTaskResponse createEmptyInstance() => create();
+  static $pb.PbList<CreateTaskTemplateSubTaskResponse> createRepeated() => $pb.PbList<CreateTaskTemplateSubTaskResponse>();
   @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesByCreatorResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetAllTaskTemplatesByCreatorResponse>(create);
-  static GetAllTaskTemplatesByCreatorResponse? _defaultInstance;
+  static CreateTaskTemplateSubTaskResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CreateTaskTemplateSubTaskResponse>(create);
+  static CreateTaskTemplateSubTaskResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<GetAllTaskTemplatesByCreatorResponse_TaskTemplate> get templates => $_getList(0);
+  $core.String get id => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set id($core.String v) { $_setString(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearId() => clearField(1);
 }
 
-class GetAllTaskTemplatesByWardRequest extends $pb.GeneratedMessage {
-  factory GetAllTaskTemplatesByWardRequest({
+class GetAllTaskTemplatesRequest extends $pb.GeneratedMessage {
+  factory GetAllTaskTemplatesRequest({
     $core.String? wardId,
+    $core.String? createdBy,
+    $core.bool? privateOnly,
   }) {
     final $result = create();
     if (wardId != null) {
       $result.wardId = wardId;
     }
+    if (createdBy != null) {
+      $result.createdBy = createdBy;
+    }
+    if (privateOnly != null) {
+      $result.privateOnly = privateOnly;
+    }
     return $result;
   }
-  GetAllTaskTemplatesByWardRequest._() : super();
-  factory GetAllTaskTemplatesByWardRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetAllTaskTemplatesByWardRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  GetAllTaskTemplatesRequest._() : super();
+  factory GetAllTaskTemplatesRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory GetAllTaskTemplatesRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAllTaskTemplatesByWardRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAllTaskTemplatesRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'wardId')
+    ..aOS(2, _omitFieldNames ? '' : 'createdBy')
+    ..aOB(3, _omitFieldNames ? '' : 'privateOnly')
     ..hasRequiredFields = false
   ;
 
@@ -1260,22 +716,22 @@ class GetAllTaskTemplatesByWardRequest extends $pb.GeneratedMessage {
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  GetAllTaskTemplatesByWardRequest clone() => GetAllTaskTemplatesByWardRequest()..mergeFromMessage(this);
+  GetAllTaskTemplatesRequest clone() => GetAllTaskTemplatesRequest()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  GetAllTaskTemplatesByWardRequest copyWith(void Function(GetAllTaskTemplatesByWardRequest) updates) => super.copyWith((message) => updates(message as GetAllTaskTemplatesByWardRequest)) as GetAllTaskTemplatesByWardRequest;
+  GetAllTaskTemplatesRequest copyWith(void Function(GetAllTaskTemplatesRequest) updates) => super.copyWith((message) => updates(message as GetAllTaskTemplatesRequest)) as GetAllTaskTemplatesRequest;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesByWardRequest create() => GetAllTaskTemplatesByWardRequest._();
-  GetAllTaskTemplatesByWardRequest createEmptyInstance() => create();
-  static $pb.PbList<GetAllTaskTemplatesByWardRequest> createRepeated() => $pb.PbList<GetAllTaskTemplatesByWardRequest>();
+  static GetAllTaskTemplatesRequest create() => GetAllTaskTemplatesRequest._();
+  GetAllTaskTemplatesRequest createEmptyInstance() => create();
+  static $pb.PbList<GetAllTaskTemplatesRequest> createRepeated() => $pb.PbList<GetAllTaskTemplatesRequest>();
   @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesByWardRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetAllTaskTemplatesByWardRequest>(create);
-  static GetAllTaskTemplatesByWardRequest? _defaultInstance;
+  static GetAllTaskTemplatesRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetAllTaskTemplatesRequest>(create);
+  static GetAllTaskTemplatesRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get wardId => $_getSZ(0);
@@ -1285,10 +741,28 @@ class GetAllTaskTemplatesByWardRequest extends $pb.GeneratedMessage {
   $core.bool hasWardId() => $_has(0);
   @$pb.TagNumber(1)
   void clearWardId() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get createdBy => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set createdBy($core.String v) { $_setString(1, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasCreatedBy() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearCreatedBy() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.bool get privateOnly => $_getBF(2);
+  @$pb.TagNumber(3)
+  set privateOnly($core.bool v) { $_setBool(2, v); }
+  @$pb.TagNumber(3)
+  $core.bool hasPrivateOnly() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearPrivateOnly() => clearField(3);
 }
 
-class GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask extends $pb.GeneratedMessage {
-  factory GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask({
+class GetAllTaskTemplatesResponse_TaskTemplate_SubTask extends $pb.GeneratedMessage {
+  factory GetAllTaskTemplatesResponse_TaskTemplate_SubTask({
     $core.String? id,
     $core.String? taskTemplateId,
     $core.String? name,
@@ -1305,11 +779,11 @@ class GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask extends $pb.Generat
     }
     return $result;
   }
-  GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask._() : super();
-  factory GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  GetAllTaskTemplatesResponse_TaskTemplate_SubTask._() : super();
+  factory GetAllTaskTemplatesResponse_TaskTemplate_SubTask.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory GetAllTaskTemplatesResponse_TaskTemplate_SubTask.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAllTaskTemplatesResponse.TaskTemplate.SubTask', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'id')
     ..aOS(2, _omitFieldNames ? '' : 'taskTemplateId')
     ..aOS(3, _omitFieldNames ? '' : 'name')
@@ -1320,22 +794,22 @@ class GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask extends $pb.Generat
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask clone() => GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask()..mergeFromMessage(this);
+  GetAllTaskTemplatesResponse_TaskTemplate_SubTask clone() => GetAllTaskTemplatesResponse_TaskTemplate_SubTask()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask copyWith(void Function(GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask) updates) => super.copyWith((message) => updates(message as GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask)) as GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask;
+  GetAllTaskTemplatesResponse_TaskTemplate_SubTask copyWith(void Function(GetAllTaskTemplatesResponse_TaskTemplate_SubTask) updates) => super.copyWith((message) => updates(message as GetAllTaskTemplatesResponse_TaskTemplate_SubTask)) as GetAllTaskTemplatesResponse_TaskTemplate_SubTask;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask create() => GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask._();
-  GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask createEmptyInstance() => create();
-  static $pb.PbList<GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask> createRepeated() => $pb.PbList<GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask>();
+  static GetAllTaskTemplatesResponse_TaskTemplate_SubTask create() => GetAllTaskTemplatesResponse_TaskTemplate_SubTask._();
+  GetAllTaskTemplatesResponse_TaskTemplate_SubTask createEmptyInstance() => create();
+  static $pb.PbList<GetAllTaskTemplatesResponse_TaskTemplate_SubTask> createRepeated() => $pb.PbList<GetAllTaskTemplatesResponse_TaskTemplate_SubTask>();
   @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask>(create);
-  static GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask? _defaultInstance;
+  static GetAllTaskTemplatesResponse_TaskTemplate_SubTask getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetAllTaskTemplatesResponse_TaskTemplate_SubTask>(create);
+  static GetAllTaskTemplatesResponse_TaskTemplate_SubTask? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get id => $_getSZ(0);
@@ -1365,14 +839,14 @@ class GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask extends $pb.Generat
   void clearName() => clearField(3);
 }
 
-class GetAllTaskTemplatesByWardResponse_TaskTemplate extends $pb.GeneratedMessage {
-  factory GetAllTaskTemplatesByWardResponse_TaskTemplate({
+class GetAllTaskTemplatesResponse_TaskTemplate extends $pb.GeneratedMessage {
+  factory GetAllTaskTemplatesResponse_TaskTemplate({
     $core.String? id,
     $core.String? name,
     $core.String? description,
     $core.bool? isPublic,
     $core.String? createdBy,
-    $core.Iterable<GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask>? subtasks,
+    $core.Iterable<GetAllTaskTemplatesResponse_TaskTemplate_SubTask>? subtasks,
   }) {
     final $result = create();
     if (id != null) {
@@ -1395,17 +869,17 @@ class GetAllTaskTemplatesByWardResponse_TaskTemplate extends $pb.GeneratedMessag
     }
     return $result;
   }
-  GetAllTaskTemplatesByWardResponse_TaskTemplate._() : super();
-  factory GetAllTaskTemplatesByWardResponse_TaskTemplate.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetAllTaskTemplatesByWardResponse_TaskTemplate.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  GetAllTaskTemplatesResponse_TaskTemplate._() : super();
+  factory GetAllTaskTemplatesResponse_TaskTemplate.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory GetAllTaskTemplatesResponse_TaskTemplate.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAllTaskTemplatesByWardResponse.TaskTemplate', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAllTaskTemplatesResponse.TaskTemplate', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'id')
     ..aOS(2, _omitFieldNames ? '' : 'name')
     ..aOS(3, _omitFieldNames ? '' : 'description')
     ..aOB(4, _omitFieldNames ? '' : 'isPublic')
     ..aOS(6, _omitFieldNames ? '' : 'createdBy')
-    ..pc<GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask>(7, _omitFieldNames ? '' : 'subtasks', $pb.PbFieldType.PM, subBuilder: GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask.create)
+    ..pc<GetAllTaskTemplatesResponse_TaskTemplate_SubTask>(7, _omitFieldNames ? '' : 'subtasks', $pb.PbFieldType.PM, subBuilder: GetAllTaskTemplatesResponse_TaskTemplate_SubTask.create)
     ..hasRequiredFields = false
   ;
 
@@ -1413,22 +887,22 @@ class GetAllTaskTemplatesByWardResponse_TaskTemplate extends $pb.GeneratedMessag
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  GetAllTaskTemplatesByWardResponse_TaskTemplate clone() => GetAllTaskTemplatesByWardResponse_TaskTemplate()..mergeFromMessage(this);
+  GetAllTaskTemplatesResponse_TaskTemplate clone() => GetAllTaskTemplatesResponse_TaskTemplate()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  GetAllTaskTemplatesByWardResponse_TaskTemplate copyWith(void Function(GetAllTaskTemplatesByWardResponse_TaskTemplate) updates) => super.copyWith((message) => updates(message as GetAllTaskTemplatesByWardResponse_TaskTemplate)) as GetAllTaskTemplatesByWardResponse_TaskTemplate;
+  GetAllTaskTemplatesResponse_TaskTemplate copyWith(void Function(GetAllTaskTemplatesResponse_TaskTemplate) updates) => super.copyWith((message) => updates(message as GetAllTaskTemplatesResponse_TaskTemplate)) as GetAllTaskTemplatesResponse_TaskTemplate;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesByWardResponse_TaskTemplate create() => GetAllTaskTemplatesByWardResponse_TaskTemplate._();
-  GetAllTaskTemplatesByWardResponse_TaskTemplate createEmptyInstance() => create();
-  static $pb.PbList<GetAllTaskTemplatesByWardResponse_TaskTemplate> createRepeated() => $pb.PbList<GetAllTaskTemplatesByWardResponse_TaskTemplate>();
+  static GetAllTaskTemplatesResponse_TaskTemplate create() => GetAllTaskTemplatesResponse_TaskTemplate._();
+  GetAllTaskTemplatesResponse_TaskTemplate createEmptyInstance() => create();
+  static $pb.PbList<GetAllTaskTemplatesResponse_TaskTemplate> createRepeated() => $pb.PbList<GetAllTaskTemplatesResponse_TaskTemplate>();
   @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesByWardResponse_TaskTemplate getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetAllTaskTemplatesByWardResponse_TaskTemplate>(create);
-  static GetAllTaskTemplatesByWardResponse_TaskTemplate? _defaultInstance;
+  static GetAllTaskTemplatesResponse_TaskTemplate getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetAllTaskTemplatesResponse_TaskTemplate>(create);
+  static GetAllTaskTemplatesResponse_TaskTemplate? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get id => $_getSZ(0);
@@ -1476,12 +950,12 @@ class GetAllTaskTemplatesByWardResponse_TaskTemplate extends $pb.GeneratedMessag
   void clearCreatedBy() => clearField(6);
 
   @$pb.TagNumber(7)
-  $core.List<GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask> get subtasks => $_getList(5);
+  $core.List<GetAllTaskTemplatesResponse_TaskTemplate_SubTask> get subtasks => $_getList(5);
 }
 
-class GetAllTaskTemplatesByWardResponse extends $pb.GeneratedMessage {
-  factory GetAllTaskTemplatesByWardResponse({
-    $core.Iterable<GetAllTaskTemplatesByWardResponse_TaskTemplate>? templates,
+class GetAllTaskTemplatesResponse extends $pb.GeneratedMessage {
+  factory GetAllTaskTemplatesResponse({
+    $core.Iterable<GetAllTaskTemplatesResponse_TaskTemplate>? templates,
   }) {
     final $result = create();
     if (templates != null) {
@@ -1489,12 +963,12 @@ class GetAllTaskTemplatesByWardResponse extends $pb.GeneratedMessage {
     }
     return $result;
   }
-  GetAllTaskTemplatesByWardResponse._() : super();
-  factory GetAllTaskTemplatesByWardResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetAllTaskTemplatesByWardResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  GetAllTaskTemplatesResponse._() : super();
+  factory GetAllTaskTemplatesResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory GetAllTaskTemplatesResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAllTaskTemplatesByWardResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
-    ..pc<GetAllTaskTemplatesByWardResponse_TaskTemplate>(1, _omitFieldNames ? '' : 'templates', $pb.PbFieldType.PM, subBuilder: GetAllTaskTemplatesByWardResponse_TaskTemplate.create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAllTaskTemplatesResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'services.tasks_svc.v1'), createEmptyInstance: create)
+    ..pc<GetAllTaskTemplatesResponse_TaskTemplate>(1, _omitFieldNames ? '' : 'templates', $pb.PbFieldType.PM, subBuilder: GetAllTaskTemplatesResponse_TaskTemplate.create)
     ..hasRequiredFields = false
   ;
 
@@ -1502,25 +976,25 @@ class GetAllTaskTemplatesByWardResponse extends $pb.GeneratedMessage {
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  GetAllTaskTemplatesByWardResponse clone() => GetAllTaskTemplatesByWardResponse()..mergeFromMessage(this);
+  GetAllTaskTemplatesResponse clone() => GetAllTaskTemplatesResponse()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  GetAllTaskTemplatesByWardResponse copyWith(void Function(GetAllTaskTemplatesByWardResponse) updates) => super.copyWith((message) => updates(message as GetAllTaskTemplatesByWardResponse)) as GetAllTaskTemplatesByWardResponse;
+  GetAllTaskTemplatesResponse copyWith(void Function(GetAllTaskTemplatesResponse) updates) => super.copyWith((message) => updates(message as GetAllTaskTemplatesResponse)) as GetAllTaskTemplatesResponse;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesByWardResponse create() => GetAllTaskTemplatesByWardResponse._();
-  GetAllTaskTemplatesByWardResponse createEmptyInstance() => create();
-  static $pb.PbList<GetAllTaskTemplatesByWardResponse> createRepeated() => $pb.PbList<GetAllTaskTemplatesByWardResponse>();
+  static GetAllTaskTemplatesResponse create() => GetAllTaskTemplatesResponse._();
+  GetAllTaskTemplatesResponse createEmptyInstance() => create();
+  static $pb.PbList<GetAllTaskTemplatesResponse> createRepeated() => $pb.PbList<GetAllTaskTemplatesResponse>();
   @$core.pragma('dart2js:noInline')
-  static GetAllTaskTemplatesByWardResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetAllTaskTemplatesByWardResponse>(create);
-  static GetAllTaskTemplatesByWardResponse? _defaultInstance;
+  static GetAllTaskTemplatesResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetAllTaskTemplatesResponse>(create);
+  static GetAllTaskTemplatesResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<GetAllTaskTemplatesByWardResponse_TaskTemplate> get templates => $_getList(0);
+  $core.List<GetAllTaskTemplatesResponse_TaskTemplate> get templates => $_getList(0);
 }
 
 
diff --git a/gen/dart/lib/services/tasks_svc/v1/task_template_svc.pbgrpc.dart b/gen/dart/lib/services/tasks_svc/v1/task_template_svc.pbgrpc.dart
index 964bdb0ac..bb71ce91a 100644
--- a/gen/dart/lib/services/tasks_svc/v1/task_template_svc.pbgrpc.dart
+++ b/gen/dart/lib/services/tasks_svc/v1/task_template_svc.pbgrpc.dart
@@ -25,10 +25,6 @@ class TaskTemplateServiceClient extends $grpc.Client {
       '/services.tasks_svc.v1.TaskTemplateService/CreateTaskTemplate',
       ($16.CreateTaskTemplateRequest value) => value.writeToBuffer(),
       ($core.List<$core.int> value) => $16.CreateTaskTemplateResponse.fromBuffer(value));
-  static final _$getAllTaskTemplates = $grpc.ClientMethod<$16.GetAllTaskTemplatesRequest, $16.GetAllTaskTemplatesResponse>(
-      '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplates',
-      ($16.GetAllTaskTemplatesRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $16.GetAllTaskTemplatesResponse.fromBuffer(value));
   static final _$deleteTaskTemplate = $grpc.ClientMethod<$16.DeleteTaskTemplateRequest, $16.DeleteTaskTemplateResponse>(
       '/services.tasks_svc.v1.TaskTemplateService/DeleteTaskTemplate',
       ($16.DeleteTaskTemplateRequest value) => value.writeToBuffer(),
@@ -49,14 +45,10 @@ class TaskTemplateServiceClient extends $grpc.Client {
       '/services.tasks_svc.v1.TaskTemplateService/CreateTaskTemplateSubTask',
       ($16.CreateTaskTemplateSubTaskRequest value) => value.writeToBuffer(),
       ($core.List<$core.int> value) => $16.CreateTaskTemplateSubTaskResponse.fromBuffer(value));
-  static final _$getAllTaskTemplatesByCreator = $grpc.ClientMethod<$16.GetAllTaskTemplatesByCreatorRequest, $16.GetAllTaskTemplatesByCreatorResponse>(
-      '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplatesByCreator',
-      ($16.GetAllTaskTemplatesByCreatorRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $16.GetAllTaskTemplatesByCreatorResponse.fromBuffer(value));
-  static final _$getAllTaskTemplatesByWard = $grpc.ClientMethod<$16.GetAllTaskTemplatesByWardRequest, $16.GetAllTaskTemplatesByWardResponse>(
-      '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplatesByWard',
-      ($16.GetAllTaskTemplatesByWardRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $16.GetAllTaskTemplatesByWardResponse.fromBuffer(value));
+  static final _$getAllTaskTemplates = $grpc.ClientMethod<$16.GetAllTaskTemplatesRequest, $16.GetAllTaskTemplatesResponse>(
+      '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplates',
+      ($16.GetAllTaskTemplatesRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $16.GetAllTaskTemplatesResponse.fromBuffer(value));
 
   TaskTemplateServiceClient($grpc.ClientChannel channel,
       {$grpc.CallOptions? options,
@@ -68,10 +60,6 @@ class TaskTemplateServiceClient extends $grpc.Client {
     return $createUnaryCall(_$createTaskTemplate, request, options: options);
   }
 
-  $grpc.ResponseFuture<$16.GetAllTaskTemplatesResponse> getAllTaskTemplates($16.GetAllTaskTemplatesRequest request, {$grpc.CallOptions? options}) {
-    return $createUnaryCall(_$getAllTaskTemplates, request, options: options);
-  }
-
   $grpc.ResponseFuture<$16.DeleteTaskTemplateResponse> deleteTaskTemplate($16.DeleteTaskTemplateRequest request, {$grpc.CallOptions? options}) {
     return $createUnaryCall(_$deleteTaskTemplate, request, options: options);
   }
@@ -92,12 +80,8 @@ class TaskTemplateServiceClient extends $grpc.Client {
     return $createUnaryCall(_$createTaskTemplateSubTask, request, options: options);
   }
 
-  $grpc.ResponseFuture<$16.GetAllTaskTemplatesByCreatorResponse> getAllTaskTemplatesByCreator($16.GetAllTaskTemplatesByCreatorRequest request, {$grpc.CallOptions? options}) {
-    return $createUnaryCall(_$getAllTaskTemplatesByCreator, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$16.GetAllTaskTemplatesByWardResponse> getAllTaskTemplatesByWard($16.GetAllTaskTemplatesByWardRequest request, {$grpc.CallOptions? options}) {
-    return $createUnaryCall(_$getAllTaskTemplatesByWard, request, options: options);
+  $grpc.ResponseFuture<$16.GetAllTaskTemplatesResponse> getAllTaskTemplates($16.GetAllTaskTemplatesRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$getAllTaskTemplates, request, options: options);
   }
 }
 
@@ -113,13 +97,6 @@ abstract class TaskTemplateServiceBase extends $grpc.Service {
         false,
         ($core.List<$core.int> value) => $16.CreateTaskTemplateRequest.fromBuffer(value),
         ($16.CreateTaskTemplateResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$16.GetAllTaskTemplatesRequest, $16.GetAllTaskTemplatesResponse>(
-        'GetAllTaskTemplates',
-        getAllTaskTemplates_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $16.GetAllTaskTemplatesRequest.fromBuffer(value),
-        ($16.GetAllTaskTemplatesResponse value) => value.writeToBuffer()));
     $addMethod($grpc.ServiceMethod<$16.DeleteTaskTemplateRequest, $16.DeleteTaskTemplateResponse>(
         'DeleteTaskTemplate',
         deleteTaskTemplate_Pre,
@@ -155,30 +132,19 @@ abstract class TaskTemplateServiceBase extends $grpc.Service {
         false,
         ($core.List<$core.int> value) => $16.CreateTaskTemplateSubTaskRequest.fromBuffer(value),
         ($16.CreateTaskTemplateSubTaskResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$16.GetAllTaskTemplatesByCreatorRequest, $16.GetAllTaskTemplatesByCreatorResponse>(
-        'GetAllTaskTemplatesByCreator',
-        getAllTaskTemplatesByCreator_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $16.GetAllTaskTemplatesByCreatorRequest.fromBuffer(value),
-        ($16.GetAllTaskTemplatesByCreatorResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$16.GetAllTaskTemplatesByWardRequest, $16.GetAllTaskTemplatesByWardResponse>(
-        'GetAllTaskTemplatesByWard',
-        getAllTaskTemplatesByWard_Pre,
+    $addMethod($grpc.ServiceMethod<$16.GetAllTaskTemplatesRequest, $16.GetAllTaskTemplatesResponse>(
+        'GetAllTaskTemplates',
+        getAllTaskTemplates_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $16.GetAllTaskTemplatesByWardRequest.fromBuffer(value),
-        ($16.GetAllTaskTemplatesByWardResponse value) => value.writeToBuffer()));
+        ($core.List<$core.int> value) => $16.GetAllTaskTemplatesRequest.fromBuffer(value),
+        ($16.GetAllTaskTemplatesResponse value) => value.writeToBuffer()));
   }
 
   $async.Future<$16.CreateTaskTemplateResponse> createTaskTemplate_Pre($grpc.ServiceCall call, $async.Future<$16.CreateTaskTemplateRequest> request) async {
     return createTaskTemplate(call, await request);
   }
 
-  $async.Future<$16.GetAllTaskTemplatesResponse> getAllTaskTemplates_Pre($grpc.ServiceCall call, $async.Future<$16.GetAllTaskTemplatesRequest> request) async {
-    return getAllTaskTemplates(call, await request);
-  }
-
   $async.Future<$16.DeleteTaskTemplateResponse> deleteTaskTemplate_Pre($grpc.ServiceCall call, $async.Future<$16.DeleteTaskTemplateRequest> request) async {
     return deleteTaskTemplate(call, await request);
   }
@@ -199,21 +165,15 @@ abstract class TaskTemplateServiceBase extends $grpc.Service {
     return createTaskTemplateSubTask(call, await request);
   }
 
-  $async.Future<$16.GetAllTaskTemplatesByCreatorResponse> getAllTaskTemplatesByCreator_Pre($grpc.ServiceCall call, $async.Future<$16.GetAllTaskTemplatesByCreatorRequest> request) async {
-    return getAllTaskTemplatesByCreator(call, await request);
-  }
-
-  $async.Future<$16.GetAllTaskTemplatesByWardResponse> getAllTaskTemplatesByWard_Pre($grpc.ServiceCall call, $async.Future<$16.GetAllTaskTemplatesByWardRequest> request) async {
-    return getAllTaskTemplatesByWard(call, await request);
+  $async.Future<$16.GetAllTaskTemplatesResponse> getAllTaskTemplates_Pre($grpc.ServiceCall call, $async.Future<$16.GetAllTaskTemplatesRequest> request) async {
+    return getAllTaskTemplates(call, await request);
   }
 
   $async.Future<$16.CreateTaskTemplateResponse> createTaskTemplate($grpc.ServiceCall call, $16.CreateTaskTemplateRequest request);
-  $async.Future<$16.GetAllTaskTemplatesResponse> getAllTaskTemplates($grpc.ServiceCall call, $16.GetAllTaskTemplatesRequest request);
   $async.Future<$16.DeleteTaskTemplateResponse> deleteTaskTemplate($grpc.ServiceCall call, $16.DeleteTaskTemplateRequest request);
   $async.Future<$16.DeleteTaskTemplateSubTaskResponse> deleteTaskTemplateSubTask($grpc.ServiceCall call, $16.DeleteTaskTemplateSubTaskRequest request);
   $async.Future<$16.UpdateTaskTemplateResponse> updateTaskTemplate($grpc.ServiceCall call, $16.UpdateTaskTemplateRequest request);
   $async.Future<$16.UpdateTaskTemplateSubTaskResponse> updateTaskTemplateSubTask($grpc.ServiceCall call, $16.UpdateTaskTemplateSubTaskRequest request);
   $async.Future<$16.CreateTaskTemplateSubTaskResponse> createTaskTemplateSubTask($grpc.ServiceCall call, $16.CreateTaskTemplateSubTaskRequest request);
-  $async.Future<$16.GetAllTaskTemplatesByCreatorResponse> getAllTaskTemplatesByCreator($grpc.ServiceCall call, $16.GetAllTaskTemplatesByCreatorRequest request);
-  $async.Future<$16.GetAllTaskTemplatesByWardResponse> getAllTaskTemplatesByWard($grpc.ServiceCall call, $16.GetAllTaskTemplatesByWardRequest request);
+  $async.Future<$16.GetAllTaskTemplatesResponse> getAllTaskTemplates($grpc.ServiceCall call, $16.GetAllTaskTemplatesRequest request);
 }
diff --git a/gen/dart/lib/services/tasks_svc/v1/task_template_svc.pbjson.dart b/gen/dart/lib/services/tasks_svc/v1/task_template_svc.pbjson.dart
index 042b5b790..f2acae0ba 100644
--- a/gen/dart/lib/services/tasks_svc/v1/task_template_svc.pbjson.dart
+++ b/gen/dart/lib/services/tasks_svc/v1/task_template_svc.pbjson.dart
@@ -57,60 +57,6 @@ const CreateTaskTemplateResponse$json = {
 final $typed_data.Uint8List createTaskTemplateResponseDescriptor = $convert.base64Decode(
     'ChpDcmVhdGVUYXNrVGVtcGxhdGVSZXNwb25zZRIOCgJpZBgBIAEoCVICaWQ=');
 
-@$core.Deprecated('Use getAllTaskTemplatesRequestDescriptor instead')
-const GetAllTaskTemplatesRequest$json = {
-  '1': 'GetAllTaskTemplatesRequest',
-};
-
-/// Descriptor for `GetAllTaskTemplatesRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getAllTaskTemplatesRequestDescriptor = $convert.base64Decode(
-    'ChpHZXRBbGxUYXNrVGVtcGxhdGVzUmVxdWVzdA==');
-
-@$core.Deprecated('Use getAllTaskTemplatesResponseDescriptor instead')
-const GetAllTaskTemplatesResponse$json = {
-  '1': 'GetAllTaskTemplatesResponse',
-  '2': [
-    {'1': 'templates', '3': 1, '4': 3, '5': 11, '6': '.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate', '10': 'templates'},
-  ],
-  '3': [GetAllTaskTemplatesResponse_TaskTemplate$json],
-};
-
-@$core.Deprecated('Use getAllTaskTemplatesResponseDescriptor instead')
-const GetAllTaskTemplatesResponse_TaskTemplate$json = {
-  '1': 'TaskTemplate',
-  '2': [
-    {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
-    {'1': 'name', '3': 2, '4': 1, '5': 9, '10': 'name'},
-    {'1': 'description', '3': 3, '4': 1, '5': 9, '10': 'description'},
-    {'1': 'is_public', '3': 4, '4': 1, '5': 8, '10': 'isPublic'},
-    {'1': 'created_by', '3': 6, '4': 1, '5': 9, '10': 'createdBy'},
-    {'1': 'subtasks', '3': 7, '4': 3, '5': 11, '6': '.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask', '10': 'subtasks'},
-  ],
-  '3': [GetAllTaskTemplatesResponse_TaskTemplate_SubTask$json],
-};
-
-@$core.Deprecated('Use getAllTaskTemplatesResponseDescriptor instead')
-const GetAllTaskTemplatesResponse_TaskTemplate_SubTask$json = {
-  '1': 'SubTask',
-  '2': [
-    {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
-    {'1': 'task_template_id', '3': 2, '4': 1, '5': 9, '10': 'taskTemplateId'},
-    {'1': 'name', '3': 3, '4': 1, '5': 9, '10': 'name'},
-  ],
-};
-
-/// Descriptor for `GetAllTaskTemplatesResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getAllTaskTemplatesResponseDescriptor = $convert.base64Decode(
-    'ChtHZXRBbGxUYXNrVGVtcGxhdGVzUmVzcG9uc2USXQoJdGVtcGxhdGVzGAEgAygLMj8uc2Vydm'
-    'ljZXMudGFza3Nfc3ZjLnYxLkdldEFsbFRhc2tUZW1wbGF0ZXNSZXNwb25zZS5UYXNrVGVtcGxh'
-    'dGVSCXRlbXBsYXRlcxrOAgoMVGFza1RlbXBsYXRlEg4KAmlkGAEgASgJUgJpZBISCgRuYW1lGA'
-    'IgASgJUgRuYW1lEiAKC2Rlc2NyaXB0aW9uGAMgASgJUgtkZXNjcmlwdGlvbhIbCglpc19wdWJs'
-    'aWMYBCABKAhSCGlzUHVibGljEh0KCmNyZWF0ZWRfYnkYBiABKAlSCWNyZWF0ZWRCeRJjCghzdW'
-    'J0YXNrcxgHIAMoCzJHLnNlcnZpY2VzLnRhc2tzX3N2Yy52MS5HZXRBbGxUYXNrVGVtcGxhdGVz'
-    'UmVzcG9uc2UuVGFza1RlbXBsYXRlLlN1YlRhc2tSCHN1YnRhc2tzGlcKB1N1YlRhc2sSDgoCaW'
-    'QYASABKAlSAmlkEigKEHRhc2tfdGVtcGxhdGVfaWQYAiABKAlSDnRhc2tUZW1wbGF0ZUlkEhIK'
-    'BG5hbWUYAyABKAlSBG5hbWU=');
-
 @$core.Deprecated('Use deleteTaskTemplateRequestDescriptor instead')
 const DeleteTaskTemplateRequest$json = {
   '1': 'DeleteTaskTemplateRequest',
@@ -234,92 +180,37 @@ const CreateTaskTemplateSubTaskResponse$json = {
 final $typed_data.Uint8List createTaskTemplateSubTaskResponseDescriptor = $convert.base64Decode(
     'CiFDcmVhdGVUYXNrVGVtcGxhdGVTdWJUYXNrUmVzcG9uc2USDgoCaWQYASABKAlSAmlk');
 
-@$core.Deprecated('Use getAllTaskTemplatesByCreatorRequestDescriptor instead')
-const GetAllTaskTemplatesByCreatorRequest$json = {
-  '1': 'GetAllTaskTemplatesByCreatorRequest',
+@$core.Deprecated('Use getAllTaskTemplatesRequestDescriptor instead')
+const GetAllTaskTemplatesRequest$json = {
+  '1': 'GetAllTaskTemplatesRequest',
   '2': [
-    {'1': 'created_by', '3': 1, '4': 1, '5': 9, '10': 'createdBy'},
-    {'1': 'private_only', '3': 2, '4': 1, '5': 8, '9': 0, '10': 'privateOnly', '17': true},
+    {'1': 'ward_id', '3': 1, '4': 1, '5': 9, '9': 0, '10': 'wardId', '17': true},
+    {'1': 'created_by', '3': 2, '4': 1, '5': 9, '9': 1, '10': 'createdBy', '17': true},
+    {'1': 'private_only', '3': 3, '4': 1, '5': 8, '10': 'privateOnly'},
   ],
   '8': [
-    {'1': '_private_only'},
-  ],
-};
-
-/// Descriptor for `GetAllTaskTemplatesByCreatorRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getAllTaskTemplatesByCreatorRequestDescriptor = $convert.base64Decode(
-    'CiNHZXRBbGxUYXNrVGVtcGxhdGVzQnlDcmVhdG9yUmVxdWVzdBIdCgpjcmVhdGVkX2J5GAEgAS'
-    'gJUgljcmVhdGVkQnkSJgoMcHJpdmF0ZV9vbmx5GAIgASgISABSC3ByaXZhdGVPbmx5iAEBQg8K'
-    'DV9wcml2YXRlX29ubHk=');
-
-@$core.Deprecated('Use getAllTaskTemplatesByCreatorResponseDescriptor instead')
-const GetAllTaskTemplatesByCreatorResponse$json = {
-  '1': 'GetAllTaskTemplatesByCreatorResponse',
-  '2': [
-    {'1': 'templates', '3': 1, '4': 3, '5': 11, '6': '.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate', '10': 'templates'},
-  ],
-  '3': [GetAllTaskTemplatesByCreatorResponse_TaskTemplate$json],
-};
-
-@$core.Deprecated('Use getAllTaskTemplatesByCreatorResponseDescriptor instead')
-const GetAllTaskTemplatesByCreatorResponse_TaskTemplate$json = {
-  '1': 'TaskTemplate',
-  '2': [
-    {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
-    {'1': 'name', '3': 2, '4': 1, '5': 9, '10': 'name'},
-    {'1': 'description', '3': 3, '4': 1, '5': 9, '10': 'description'},
-    {'1': 'is_public', '3': 4, '4': 1, '5': 8, '10': 'isPublic'},
-    {'1': 'subtasks', '3': 7, '4': 3, '5': 11, '6': '.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask', '10': 'subtasks'},
-  ],
-  '3': [GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask$json],
-};
-
-@$core.Deprecated('Use getAllTaskTemplatesByCreatorResponseDescriptor instead')
-const GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask$json = {
-  '1': 'SubTask',
-  '2': [
-    {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
-    {'1': 'task_template_id', '3': 2, '4': 1, '5': 9, '10': 'taskTemplateId'},
-    {'1': 'name', '3': 3, '4': 1, '5': 9, '10': 'name'},
-  ],
-};
-
-/// Descriptor for `GetAllTaskTemplatesByCreatorResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getAllTaskTemplatesByCreatorResponseDescriptor = $convert.base64Decode(
-    'CiRHZXRBbGxUYXNrVGVtcGxhdGVzQnlDcmVhdG9yUmVzcG9uc2USZgoJdGVtcGxhdGVzGAEgAy'
-    'gLMkguc2VydmljZXMudGFza3Nfc3ZjLnYxLkdldEFsbFRhc2tUZW1wbGF0ZXNCeUNyZWF0b3JS'
-    'ZXNwb25zZS5UYXNrVGVtcGxhdGVSCXRlbXBsYXRlcxq4AgoMVGFza1RlbXBsYXRlEg4KAmlkGA'
-    'EgASgJUgJpZBISCgRuYW1lGAIgASgJUgRuYW1lEiAKC2Rlc2NyaXB0aW9uGAMgASgJUgtkZXNj'
-    'cmlwdGlvbhIbCglpc19wdWJsaWMYBCABKAhSCGlzUHVibGljEmwKCHN1YnRhc2tzGAcgAygLMl'
-    'Auc2VydmljZXMudGFza3Nfc3ZjLnYxLkdldEFsbFRhc2tUZW1wbGF0ZXNCeUNyZWF0b3JSZXNw'
-    'b25zZS5UYXNrVGVtcGxhdGUuU3ViVGFza1IIc3VidGFza3MaVwoHU3ViVGFzaxIOCgJpZBgBIA'
-    'EoCVICaWQSKAoQdGFza190ZW1wbGF0ZV9pZBgCIAEoCVIOdGFza1RlbXBsYXRlSWQSEgoEbmFt'
-    'ZRgDIAEoCVIEbmFtZQ==');
-
-@$core.Deprecated('Use getAllTaskTemplatesByWardRequestDescriptor instead')
-const GetAllTaskTemplatesByWardRequest$json = {
-  '1': 'GetAllTaskTemplatesByWardRequest',
-  '2': [
-    {'1': 'ward_id', '3': 1, '4': 1, '5': 9, '10': 'wardId'},
+    {'1': '_ward_id'},
+    {'1': '_created_by'},
   ],
 };
 
-/// Descriptor for `GetAllTaskTemplatesByWardRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getAllTaskTemplatesByWardRequestDescriptor = $convert.base64Decode(
-    'CiBHZXRBbGxUYXNrVGVtcGxhdGVzQnlXYXJkUmVxdWVzdBIXCgd3YXJkX2lkGAEgASgJUgZ3YX'
-    'JkSWQ=');
+/// Descriptor for `GetAllTaskTemplatesRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getAllTaskTemplatesRequestDescriptor = $convert.base64Decode(
+    'ChpHZXRBbGxUYXNrVGVtcGxhdGVzUmVxdWVzdBIcCgd3YXJkX2lkGAEgASgJSABSBndhcmRJZI'
+    'gBARIiCgpjcmVhdGVkX2J5GAIgASgJSAFSCWNyZWF0ZWRCeYgBARIhCgxwcml2YXRlX29ubHkY'
+    'AyABKAhSC3ByaXZhdGVPbmx5QgoKCF93YXJkX2lkQg0KC19jcmVhdGVkX2J5');
 
-@$core.Deprecated('Use getAllTaskTemplatesByWardResponseDescriptor instead')
-const GetAllTaskTemplatesByWardResponse$json = {
-  '1': 'GetAllTaskTemplatesByWardResponse',
+@$core.Deprecated('Use getAllTaskTemplatesResponseDescriptor instead')
+const GetAllTaskTemplatesResponse$json = {
+  '1': 'GetAllTaskTemplatesResponse',
   '2': [
-    {'1': 'templates', '3': 1, '4': 3, '5': 11, '6': '.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate', '10': 'templates'},
+    {'1': 'templates', '3': 1, '4': 3, '5': 11, '6': '.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate', '10': 'templates'},
   ],
-  '3': [GetAllTaskTemplatesByWardResponse_TaskTemplate$json],
+  '3': [GetAllTaskTemplatesResponse_TaskTemplate$json],
 };
 
-@$core.Deprecated('Use getAllTaskTemplatesByWardResponseDescriptor instead')
-const GetAllTaskTemplatesByWardResponse_TaskTemplate$json = {
+@$core.Deprecated('Use getAllTaskTemplatesResponseDescriptor instead')
+const GetAllTaskTemplatesResponse_TaskTemplate$json = {
   '1': 'TaskTemplate',
   '2': [
     {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
@@ -327,13 +218,13 @@ const GetAllTaskTemplatesByWardResponse_TaskTemplate$json = {
     {'1': 'description', '3': 3, '4': 1, '5': 9, '10': 'description'},
     {'1': 'is_public', '3': 4, '4': 1, '5': 8, '10': 'isPublic'},
     {'1': 'created_by', '3': 6, '4': 1, '5': 9, '10': 'createdBy'},
-    {'1': 'subtasks', '3': 7, '4': 3, '5': 11, '6': '.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask', '10': 'subtasks'},
+    {'1': 'subtasks', '3': 7, '4': 3, '5': 11, '6': '.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask', '10': 'subtasks'},
   ],
-  '3': [GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask$json],
+  '3': [GetAllTaskTemplatesResponse_TaskTemplate_SubTask$json],
 };
 
-@$core.Deprecated('Use getAllTaskTemplatesByWardResponseDescriptor instead')
-const GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask$json = {
+@$core.Deprecated('Use getAllTaskTemplatesResponseDescriptor instead')
+const GetAllTaskTemplatesResponse_TaskTemplate_SubTask$json = {
   '1': 'SubTask',
   '2': [
     {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
@@ -342,15 +233,15 @@ const GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask$json = {
   ],
 };
 
-/// Descriptor for `GetAllTaskTemplatesByWardResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getAllTaskTemplatesByWardResponseDescriptor = $convert.base64Decode(
-    'CiFHZXRBbGxUYXNrVGVtcGxhdGVzQnlXYXJkUmVzcG9uc2USYwoJdGVtcGxhdGVzGAEgAygLMk'
-    'Uuc2VydmljZXMudGFza3Nfc3ZjLnYxLkdldEFsbFRhc2tUZW1wbGF0ZXNCeVdhcmRSZXNwb25z'
-    'ZS5UYXNrVGVtcGxhdGVSCXRlbXBsYXRlcxrUAgoMVGFza1RlbXBsYXRlEg4KAmlkGAEgASgJUg'
-    'JpZBISCgRuYW1lGAIgASgJUgRuYW1lEiAKC2Rlc2NyaXB0aW9uGAMgASgJUgtkZXNjcmlwdGlv'
-    'bhIbCglpc19wdWJsaWMYBCABKAhSCGlzUHVibGljEh0KCmNyZWF0ZWRfYnkYBiABKAlSCWNyZW'
-    'F0ZWRCeRJpCghzdWJ0YXNrcxgHIAMoCzJNLnNlcnZpY2VzLnRhc2tzX3N2Yy52MS5HZXRBbGxU'
-    'YXNrVGVtcGxhdGVzQnlXYXJkUmVzcG9uc2UuVGFza1RlbXBsYXRlLlN1YlRhc2tSCHN1YnRhc2'
-    'tzGlcKB1N1YlRhc2sSDgoCaWQYASABKAlSAmlkEigKEHRhc2tfdGVtcGxhdGVfaWQYAiABKAlS'
-    'DnRhc2tUZW1wbGF0ZUlkEhIKBG5hbWUYAyABKAlSBG5hbWU=');
+/// Descriptor for `GetAllTaskTemplatesResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getAllTaskTemplatesResponseDescriptor = $convert.base64Decode(
+    'ChtHZXRBbGxUYXNrVGVtcGxhdGVzUmVzcG9uc2USXQoJdGVtcGxhdGVzGAEgAygLMj8uc2Vydm'
+    'ljZXMudGFza3Nfc3ZjLnYxLkdldEFsbFRhc2tUZW1wbGF0ZXNSZXNwb25zZS5UYXNrVGVtcGxh'
+    'dGVSCXRlbXBsYXRlcxrOAgoMVGFza1RlbXBsYXRlEg4KAmlkGAEgASgJUgJpZBISCgRuYW1lGA'
+    'IgASgJUgRuYW1lEiAKC2Rlc2NyaXB0aW9uGAMgASgJUgtkZXNjcmlwdGlvbhIbCglpc19wdWJs'
+    'aWMYBCABKAhSCGlzUHVibGljEh0KCmNyZWF0ZWRfYnkYBiABKAlSCWNyZWF0ZWRCeRJjCghzdW'
+    'J0YXNrcxgHIAMoCzJHLnNlcnZpY2VzLnRhc2tzX3N2Yy52MS5HZXRBbGxUYXNrVGVtcGxhdGVz'
+    'UmVzcG9uc2UuVGFza1RlbXBsYXRlLlN1YlRhc2tSCHN1YnRhc2tzGlcKB1N1YlRhc2sSDgoCaW'
+    'QYASABKAlSAmlkEigKEHRhc2tfdGVtcGxhdGVfaWQYAiABKAlSDnRhc2tUZW1wbGF0ZUlkEhIK'
+    'BG5hbWUYAyABKAlSBG5hbWU=');
 
diff --git a/gen/go/services/tasks_svc/v1/patient_svc.pb.go b/gen/go/services/tasks_svc/v1/patient_svc.pb.go
index d6e0ffde9..8d715abdf 100644
--- a/gen/go/services/tasks_svc/v1/patient_svc.pb.go
+++ b/gen/go/services/tasks_svc/v1/patient_svc.pb.go
@@ -1356,6 +1356,91 @@ func (*ReadmitPatientResponse) Descriptor() ([]byte, []int) {
 	return file_services_tasks_svc_v1_patient_svc_proto_rawDescGZIP(), []int{25}
 }
 
+type DeletePatientRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+}
+
+func (x *DeletePatientRequest) Reset() {
+	*x = DeletePatientRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[26]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DeletePatientRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DeletePatientRequest) ProtoMessage() {}
+
+func (x *DeletePatientRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[26]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use DeletePatientRequest.ProtoReflect.Descriptor instead.
+func (*DeletePatientRequest) Descriptor() ([]byte, []int) {
+	return file_services_tasks_svc_v1_patient_svc_proto_rawDescGZIP(), []int{26}
+}
+
+func (x *DeletePatientRequest) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+type DeletePatientResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *DeletePatientResponse) Reset() {
+	*x = DeletePatientResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[27]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DeletePatientResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DeletePatientResponse) ProtoMessage() {}
+
+func (x *DeletePatientResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[27]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use DeletePatientResponse.ProtoReflect.Descriptor instead.
+func (*DeletePatientResponse) Descriptor() ([]byte, []int) {
+	return file_services_tasks_svc_v1_patient_svc_proto_rawDescGZIP(), []int{27}
+}
+
 type GetPatientResponse_Room struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1369,7 +1454,7 @@ type GetPatientResponse_Room struct {
 func (x *GetPatientResponse_Room) Reset() {
 	*x = GetPatientResponse_Room{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[26]
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[28]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1382,7 +1467,7 @@ func (x *GetPatientResponse_Room) String() string {
 func (*GetPatientResponse_Room) ProtoMessage() {}
 
 func (x *GetPatientResponse_Room) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[26]
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[28]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1431,7 +1516,7 @@ type GetPatientResponse_Bed struct {
 func (x *GetPatientResponse_Bed) Reset() {
 	*x = GetPatientResponse_Bed{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[27]
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[29]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1444,7 +1529,7 @@ func (x *GetPatientResponse_Bed) String() string {
 func (*GetPatientResponse_Bed) ProtoMessage() {}
 
 func (x *GetPatientResponse_Bed) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[27]
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[29]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1488,7 +1573,7 @@ type GetPatientsByWardResponse_Patient struct {
 func (x *GetPatientsByWardResponse_Patient) Reset() {
 	*x = GetPatientsByWardResponse_Patient{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[28]
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[30]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1501,7 +1586,7 @@ func (x *GetPatientsByWardResponse_Patient) String() string {
 func (*GetPatientsByWardResponse_Patient) ProtoMessage() {}
 
 func (x *GetPatientsByWardResponse_Patient) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[28]
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[30]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1558,7 +1643,7 @@ type GetPatientAssignmentByWardResponse_Room struct {
 func (x *GetPatientAssignmentByWardResponse_Room) Reset() {
 	*x = GetPatientAssignmentByWardResponse_Room{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[29]
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[31]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1571,7 +1656,7 @@ func (x *GetPatientAssignmentByWardResponse_Room) String() string {
 func (*GetPatientAssignmentByWardResponse_Room) ProtoMessage() {}
 
 func (x *GetPatientAssignmentByWardResponse_Room) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[29]
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[31]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1621,7 +1706,7 @@ type GetPatientAssignmentByWardResponse_Room_Bed struct {
 func (x *GetPatientAssignmentByWardResponse_Room_Bed) Reset() {
 	*x = GetPatientAssignmentByWardResponse_Room_Bed{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[30]
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[32]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1634,7 +1719,7 @@ func (x *GetPatientAssignmentByWardResponse_Room_Bed) String() string {
 func (*GetPatientAssignmentByWardResponse_Room_Bed) ProtoMessage() {}
 
 func (x *GetPatientAssignmentByWardResponse_Room_Bed) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[30]
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[32]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1683,7 +1768,7 @@ type GetPatientAssignmentByWardResponse_Room_Bed_Patient struct {
 func (x *GetPatientAssignmentByWardResponse_Room_Bed_Patient) Reset() {
 	*x = GetPatientAssignmentByWardResponse_Room_Bed_Patient{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[31]
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[33]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1696,7 +1781,7 @@ func (x *GetPatientAssignmentByWardResponse_Room_Bed_Patient) String() string {
 func (*GetPatientAssignmentByWardResponse_Room_Bed_Patient) ProtoMessage() {}
 
 func (x *GetPatientAssignmentByWardResponse_Room_Bed_Patient) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[31]
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[33]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1739,7 +1824,7 @@ type GetPatientDetailsResponse_Room struct {
 func (x *GetPatientDetailsResponse_Room) Reset() {
 	*x = GetPatientDetailsResponse_Room{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[32]
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[34]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1752,7 +1837,7 @@ func (x *GetPatientDetailsResponse_Room) String() string {
 func (*GetPatientDetailsResponse_Room) ProtoMessage() {}
 
 func (x *GetPatientDetailsResponse_Room) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[32]
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[34]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1801,7 +1886,7 @@ type GetPatientDetailsResponse_Bed struct {
 func (x *GetPatientDetailsResponse_Bed) Reset() {
 	*x = GetPatientDetailsResponse_Bed{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[33]
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[35]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1814,7 +1899,7 @@ func (x *GetPatientDetailsResponse_Bed) String() string {
 func (*GetPatientDetailsResponse_Bed) ProtoMessage() {}
 
 func (x *GetPatientDetailsResponse_Bed) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[33]
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[35]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1862,7 +1947,7 @@ type GetPatientDetailsResponse_Task struct {
 func (x *GetPatientDetailsResponse_Task) Reset() {
 	*x = GetPatientDetailsResponse_Task{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[34]
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[36]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1875,7 +1960,7 @@ func (x *GetPatientDetailsResponse_Task) String() string {
 func (*GetPatientDetailsResponse_Task) ProtoMessage() {}
 
 func (x *GetPatientDetailsResponse_Task) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[34]
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[36]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1960,7 +2045,7 @@ type GetPatientDetailsResponse_Task_SubTask struct {
 func (x *GetPatientDetailsResponse_Task_SubTask) Reset() {
 	*x = GetPatientDetailsResponse_Task_SubTask{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[35]
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[37]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1973,7 +2058,7 @@ func (x *GetPatientDetailsResponse_Task_SubTask) String() string {
 func (*GetPatientDetailsResponse_Task_SubTask) ProtoMessage() {}
 
 func (x *GetPatientDetailsResponse_Task_SubTask) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[35]
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[37]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2022,7 +2107,7 @@ type GetPatientListResponse_Bed struct {
 func (x *GetPatientListResponse_Bed) Reset() {
 	*x = GetPatientListResponse_Bed{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[36]
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[38]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2035,7 +2120,7 @@ func (x *GetPatientListResponse_Bed) String() string {
 func (*GetPatientListResponse_Bed) ProtoMessage() {}
 
 func (x *GetPatientListResponse_Bed) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[36]
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[38]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2078,7 +2163,7 @@ type GetPatientListResponse_Room struct {
 func (x *GetPatientListResponse_Room) Reset() {
 	*x = GetPatientListResponse_Room{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[37]
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[39]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2091,7 +2176,7 @@ func (x *GetPatientListResponse_Room) String() string {
 func (*GetPatientListResponse_Room) ProtoMessage() {}
 
 func (x *GetPatientListResponse_Room) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[37]
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[39]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2144,7 +2229,7 @@ type GetPatientListResponse_Patient struct {
 func (x *GetPatientListResponse_Patient) Reset() {
 	*x = GetPatientListResponse_Patient{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[38]
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[40]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2157,7 +2242,7 @@ func (x *GetPatientListResponse_Patient) String() string {
 func (*GetPatientListResponse_Patient) ProtoMessage() {}
 
 func (x *GetPatientListResponse_Patient) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[38]
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[40]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2233,7 +2318,7 @@ type GetPatientListResponse_Task struct {
 func (x *GetPatientListResponse_Task) Reset() {
 	*x = GetPatientListResponse_Task{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[39]
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[41]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2246,7 +2331,7 @@ func (x *GetPatientListResponse_Task) String() string {
 func (*GetPatientListResponse_Task) ProtoMessage() {}
 
 func (x *GetPatientListResponse_Task) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[39]
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[41]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2331,7 +2416,7 @@ type GetPatientListResponse_Task_SubTask struct {
 func (x *GetPatientListResponse_Task_SubTask) Reset() {
 	*x = GetPatientListResponse_Task_SubTask{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[40]
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[42]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2344,7 +2429,7 @@ func (x *GetPatientListResponse_Task_SubTask) String() string {
 func (*GetPatientListResponse_Task_SubTask) ProtoMessage() {}
 
 func (x *GetPatientListResponse_Task_SubTask) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[40]
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[42]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2393,7 +2478,7 @@ type GetRecentPatientsResponse_Bed struct {
 func (x *GetRecentPatientsResponse_Bed) Reset() {
 	*x = GetRecentPatientsResponse_Bed{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[41]
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[43]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2406,7 +2491,7 @@ func (x *GetRecentPatientsResponse_Bed) String() string {
 func (*GetRecentPatientsResponse_Bed) ProtoMessage() {}
 
 func (x *GetRecentPatientsResponse_Bed) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[41]
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[43]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2449,7 +2534,7 @@ type GetRecentPatientsResponse_Room struct {
 func (x *GetRecentPatientsResponse_Room) Reset() {
 	*x = GetRecentPatientsResponse_Room{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[42]
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[44]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2462,7 +2547,7 @@ func (x *GetRecentPatientsResponse_Room) String() string {
 func (*GetRecentPatientsResponse_Room) ProtoMessage() {}
 
 func (x *GetRecentPatientsResponse_Room) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[42]
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[44]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2513,7 +2598,7 @@ type GetRecentPatientsResponse_PatientWithRoomAndBed struct {
 func (x *GetRecentPatientsResponse_PatientWithRoomAndBed) Reset() {
 	*x = GetRecentPatientsResponse_PatientWithRoomAndBed{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[43]
+		mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[45]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2526,7 +2611,7 @@ func (x *GetRecentPatientsResponse_PatientWithRoomAndBed) String() string {
 func (*GetRecentPatientsResponse_PatientWithRoomAndBed) ProtoMessage() {}
 
 func (x *GetRecentPatientsResponse_PatientWithRoomAndBed) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[43]
+	mi := &file_services_tasks_svc_v1_patient_svc_proto_msgTypes[45]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2890,115 +2975,125 @@ var file_services_tasks_svc_v1_patient_svc_proto_rawDesc = []byte{
 	0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x49,
 	0x64, 0x22, 0x18, 0x0a, 0x16, 0x52, 0x65, 0x61, 0x64, 0x6d, 0x69, 0x74, 0x50, 0x61, 0x74, 0x69,
-	0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xec, 0x0b, 0x0a, 0x0e,
-	0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x6c,
-	0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x12,
-	0x2b, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73,
-	0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x61,
-	0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76,
-	0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x61, 0x74, 0x69, 0x65,
-	0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x0a,
-	0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e,
-	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e,
-	0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
-	0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x00, 0x12, 0x72, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x42,
-	0x79, 0x42, 0x65, 0x64, 0x12, 0x2d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e,
+	0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x0a, 0x14, 0x44,
+	0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x02, 0x69, 0x64, 0x22, 0x17, 0x0a, 0x15, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x61, 0x74,
+	0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xda, 0x0c, 0x0a,
+	0x0e, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12,
+	0x6c, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74,
+	0x12, 0x2b, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b,
+	0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50,
+	0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e,
+	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73,
+	0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x61, 0x74, 0x69,
+	0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x63, 0x0a,
+	0x0a, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
+	0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
+	0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65,
+	0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x00, 0x12, 0x72, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74,
+	0x42, 0x79, 0x42, 0x65, 0x64, 0x12, 0x2d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
+	0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65,
+	0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x42, 0x79, 0x42, 0x65, 0x64, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e,
 	0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
-	0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x42, 0x79, 0x42, 0x65, 0x64, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74,
-	0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50,
-	0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x42, 0x79, 0x42, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69,
-	0x65, 0x6e, 0x74, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x12, 0x2f, 0x2e, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e,
-	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x79,
-	0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e, 0x73, 0x65,
+	0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x42, 0x79, 0x42, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74,
+	0x69, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x12, 0x2f, 0x2e, 0x73, 0x65,
 	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
 	0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x42,
-	0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
-	0x93, 0x01, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x41, 0x73,
-	0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x12, 0x38,
-	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f,
-	0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e,
-	0x74, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x79, 0x57, 0x61, 0x72,
-	0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x39, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31,
-	0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x41, 0x73, 0x73, 0x69, 0x67,
-	0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69,
-	0x65, 0x6e, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x2f, 0x2e, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e,
-	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x74,
-	0x61, 0x69, 0x6c, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e, 0x73, 0x65,
+	0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76,
+	0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x73,
+	0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x12, 0x93, 0x01, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x41,
+	0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x12,
+	0x38, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73,
+	0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65,
+	0x6e, 0x74, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x79, 0x57, 0x61,
+	0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x39, 0x2e, 0x73, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76,
+	0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x41, 0x73, 0x73, 0x69,
+	0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74,
+	0x69, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x2f, 0x2e, 0x73, 0x65,
 	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
 	0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x44, 0x65,
-	0x74, 0x61, 0x69, 0x6c, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
-	0x6f, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73,
-	0x74, 0x12, 0x2c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73,
-	0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74,
-	0x69, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x2d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73,
-	0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65,
-	0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
-	0x12, 0x78, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x52, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x50, 0x61, 0x74,
-	0x69, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x2f, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
-	0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65,
-	0x74, 0x52, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x74, 0x61, 0x69, 0x6c, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76,
+	0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x44,
+	0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x12, 0x6f, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x4c, 0x69,
+	0x73, 0x74, 0x12, 0x2c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61,
+	0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61,
+	0x74, 0x69, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x2d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b,
+	0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x69,
+	0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x00, 0x12, 0x78, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x52, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x50, 0x61,
+	0x74, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x2f, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
 	0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47,
 	0x65, 0x74, 0x52, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x73,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6c, 0x0a, 0x0d, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x2b, 0x2e, 0x73, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
-	0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e,
-	0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31,
-	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x60, 0x0a, 0x09, 0x41, 0x73, 0x73, 0x69,
-	0x67, 0x6e, 0x42, 0x65, 0x64, 0x12, 0x27, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
-	0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x73,
-	0x73, 0x69, 0x67, 0x6e, 0x42, 0x65, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28,
-	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f,
-	0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x42, 0x65, 0x64,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x66, 0x0a, 0x0b, 0x55, 0x6e,
-	0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x42, 0x65, 0x64, 0x12, 0x29, 0x2e, 0x73, 0x65, 0x72, 0x76,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e,
+	0x47, 0x65, 0x74, 0x52, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74,
+	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6c, 0x0a, 0x0d, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x2b, 0x2e, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76,
+	0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x74, 0x69, 0x65,
+	0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x73, 0x65, 0x72, 0x76,
 	0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76,
-	0x31, 0x2e, 0x55, 0x6e, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x42, 0x65, 0x64, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e,
-	0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x61,
-	0x73, 0x73, 0x69, 0x67, 0x6e, 0x42, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x00, 0x12, 0x75, 0x0a, 0x10, 0x44, 0x69, 0x73, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x50,
-	0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x2e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x44,
-	0x69, 0x73, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x44,
-	0x69, 0x73, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6f, 0x0a, 0x0e, 0x52, 0x65, 0x61,
-	0x64, 0x6d, 0x69, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x2c, 0x2e, 0x73, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
-	0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x6d, 0x69, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65,
-	0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x73, 0x65, 0x72, 0x76,
+	0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x60, 0x0a, 0x09, 0x41, 0x73, 0x73,
+	0x69, 0x67, 0x6e, 0x42, 0x65, 0x64, 0x12, 0x27, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x41,
+	0x73, 0x73, 0x69, 0x67, 0x6e, 0x42, 0x65, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x28, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73,
+	0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x42, 0x65,
+	0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x66, 0x0a, 0x0b, 0x55,
+	0x6e, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x42, 0x65, 0x64, 0x12, 0x29, 0x2e, 0x73, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e,
+	0x76, 0x31, 0x2e, 0x55, 0x6e, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x42, 0x65, 0x64, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
+	0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e,
+	0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x42, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x00, 0x12, 0x75, 0x0a, 0x10, 0x44, 0x69, 0x73, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65,
+	0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x2e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e,
+	0x44, 0x69, 0x73, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e,
+	0x44, 0x69, 0x73, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6f, 0x0a, 0x0e, 0x52, 0x65,
+	0x61, 0x64, 0x6d, 0x69, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x2c, 0x2e, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76,
+	0x63, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x6d, 0x69, 0x74, 0x50, 0x61, 0x74, 0x69,
+	0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x73, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e,
+	0x76, 0x31, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x6d, 0x69, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e,
+	0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6c, 0x0a, 0x0d, 0x44,
+	0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x2b, 0x2e, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76,
+	0x63, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x61, 0x74, 0x69, 0x65,
+	0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x73, 0x65, 0x72, 0x76,
 	0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76,
-	0x31, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x6d, 0x69, 0x74, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0xbc, 0x01, 0x0a, 0x19, 0x63,
-	0x6f, 0x6d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b,
-	0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x42, 0x0f, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e,
-	0x74, 0x53, 0x76, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x1c, 0x67, 0x65, 0x6e,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f,
-	0x74, 0x61, 0x73, 0x6b, 0x73, 0x2d, 0x73, 0x76, 0x63, 0xa2, 0x02, 0x03, 0x53, 0x54, 0x58, 0xaa,
-	0x02, 0x14, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x73,
-	0x53, 0x76, 0x63, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x14, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x73, 0x5c, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76, 0x63, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x20,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x5c, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76,
-	0x63, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
-	0xea, 0x02, 0x16, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3a, 0x3a, 0x54, 0x61, 0x73,
-	0x6b, 0x73, 0x53, 0x76, 0x63, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0xbc, 0x01, 0x0a, 0x19, 0x63, 0x6f,
+	0x6d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73,
+	0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x42, 0x0f, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74,
+	0x53, 0x76, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x1c, 0x67, 0x65, 0x6e, 0x2f,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x74,
+	0x61, 0x73, 0x6b, 0x73, 0x2d, 0x73, 0x76, 0x63, 0xa2, 0x02, 0x03, 0x53, 0x54, 0x58, 0xaa, 0x02,
+	0x14, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53,
+	0x76, 0x63, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x14, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
+	0x5c, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76, 0x63, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x20, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x5c, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76, 0x63,
+	0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea,
+	0x02, 0x16, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3a, 0x3a, 0x54, 0x61, 0x73, 0x6b,
+	0x73, 0x53, 0x76, 0x63, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -3013,7 +3108,7 @@ func file_services_tasks_svc_v1_patient_svc_proto_rawDescGZIP() []byte {
 	return file_services_tasks_svc_v1_patient_svc_proto_rawDescData
 }
 
-var file_services_tasks_svc_v1_patient_svc_proto_msgTypes = make([]protoimpl.MessageInfo, 44)
+var file_services_tasks_svc_v1_patient_svc_proto_msgTypes = make([]protoimpl.MessageInfo, 46)
 var file_services_tasks_svc_v1_patient_svc_proto_goTypes = []interface{}{
 	(*CreatePatientRequest)(nil),                                // 0: services.tasks_svc.v1.CreatePatientRequest
 	(*CreatePatientResponse)(nil),                               // 1: services.tasks_svc.v1.CreatePatientResponse
@@ -3041,49 +3136,51 @@ var file_services_tasks_svc_v1_patient_svc_proto_goTypes = []interface{}{
 	(*DischargePatientResponse)(nil),                            // 23: services.tasks_svc.v1.DischargePatientResponse
 	(*ReadmitPatientRequest)(nil),                               // 24: services.tasks_svc.v1.ReadmitPatientRequest
 	(*ReadmitPatientResponse)(nil),                              // 25: services.tasks_svc.v1.ReadmitPatientResponse
-	(*GetPatientResponse_Room)(nil),                             // 26: services.tasks_svc.v1.GetPatientResponse.Room
-	(*GetPatientResponse_Bed)(nil),                              // 27: services.tasks_svc.v1.GetPatientResponse.Bed
-	(*GetPatientsByWardResponse_Patient)(nil),                   // 28: services.tasks_svc.v1.GetPatientsByWardResponse.Patient
-	(*GetPatientAssignmentByWardResponse_Room)(nil),             // 29: services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room
-	(*GetPatientAssignmentByWardResponse_Room_Bed)(nil),         // 30: services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.Bed
-	(*GetPatientAssignmentByWardResponse_Room_Bed_Patient)(nil), // 31: services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.Bed.Patient
-	(*GetPatientDetailsResponse_Room)(nil),                      // 32: services.tasks_svc.v1.GetPatientDetailsResponse.Room
-	(*GetPatientDetailsResponse_Bed)(nil),                       // 33: services.tasks_svc.v1.GetPatientDetailsResponse.Bed
-	(*GetPatientDetailsResponse_Task)(nil),                      // 34: services.tasks_svc.v1.GetPatientDetailsResponse.Task
-	(*GetPatientDetailsResponse_Task_SubTask)(nil),              // 35: services.tasks_svc.v1.GetPatientDetailsResponse.Task.SubTask
-	(*GetPatientListResponse_Bed)(nil),                          // 36: services.tasks_svc.v1.GetPatientListResponse.Bed
-	(*GetPatientListResponse_Room)(nil),                         // 37: services.tasks_svc.v1.GetPatientListResponse.Room
-	(*GetPatientListResponse_Patient)(nil),                      // 38: services.tasks_svc.v1.GetPatientListResponse.Patient
-	(*GetPatientListResponse_Task)(nil),                         // 39: services.tasks_svc.v1.GetPatientListResponse.Task
-	(*GetPatientListResponse_Task_SubTask)(nil),                 // 40: services.tasks_svc.v1.GetPatientListResponse.Task.SubTask
-	(*GetRecentPatientsResponse_Bed)(nil),                       // 41: services.tasks_svc.v1.GetRecentPatientsResponse.Bed
-	(*GetRecentPatientsResponse_Room)(nil),                      // 42: services.tasks_svc.v1.GetRecentPatientsResponse.Room
-	(*GetRecentPatientsResponse_PatientWithRoomAndBed)(nil),     // 43: services.tasks_svc.v1.GetRecentPatientsResponse.PatientWithRoomAndBed
-	(TaskStatus)(0),                                             // 44: services.tasks_svc.v1.TaskStatus
+	(*DeletePatientRequest)(nil),                                // 26: services.tasks_svc.v1.DeletePatientRequest
+	(*DeletePatientResponse)(nil),                               // 27: services.tasks_svc.v1.DeletePatientResponse
+	(*GetPatientResponse_Room)(nil),                             // 28: services.tasks_svc.v1.GetPatientResponse.Room
+	(*GetPatientResponse_Bed)(nil),                              // 29: services.tasks_svc.v1.GetPatientResponse.Bed
+	(*GetPatientsByWardResponse_Patient)(nil),                   // 30: services.tasks_svc.v1.GetPatientsByWardResponse.Patient
+	(*GetPatientAssignmentByWardResponse_Room)(nil),             // 31: services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room
+	(*GetPatientAssignmentByWardResponse_Room_Bed)(nil),         // 32: services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.Bed
+	(*GetPatientAssignmentByWardResponse_Room_Bed_Patient)(nil), // 33: services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.Bed.Patient
+	(*GetPatientDetailsResponse_Room)(nil),                      // 34: services.tasks_svc.v1.GetPatientDetailsResponse.Room
+	(*GetPatientDetailsResponse_Bed)(nil),                       // 35: services.tasks_svc.v1.GetPatientDetailsResponse.Bed
+	(*GetPatientDetailsResponse_Task)(nil),                      // 36: services.tasks_svc.v1.GetPatientDetailsResponse.Task
+	(*GetPatientDetailsResponse_Task_SubTask)(nil),              // 37: services.tasks_svc.v1.GetPatientDetailsResponse.Task.SubTask
+	(*GetPatientListResponse_Bed)(nil),                          // 38: services.tasks_svc.v1.GetPatientListResponse.Bed
+	(*GetPatientListResponse_Room)(nil),                         // 39: services.tasks_svc.v1.GetPatientListResponse.Room
+	(*GetPatientListResponse_Patient)(nil),                      // 40: services.tasks_svc.v1.GetPatientListResponse.Patient
+	(*GetPatientListResponse_Task)(nil),                         // 41: services.tasks_svc.v1.GetPatientListResponse.Task
+	(*GetPatientListResponse_Task_SubTask)(nil),                 // 42: services.tasks_svc.v1.GetPatientListResponse.Task.SubTask
+	(*GetRecentPatientsResponse_Bed)(nil),                       // 43: services.tasks_svc.v1.GetRecentPatientsResponse.Bed
+	(*GetRecentPatientsResponse_Room)(nil),                      // 44: services.tasks_svc.v1.GetRecentPatientsResponse.Room
+	(*GetRecentPatientsResponse_PatientWithRoomAndBed)(nil),     // 45: services.tasks_svc.v1.GetRecentPatientsResponse.PatientWithRoomAndBed
+	(TaskStatus)(0),                                             // 46: services.tasks_svc.v1.TaskStatus
 }
 var file_services_tasks_svc_v1_patient_svc_proto_depIdxs = []int32{
-	26, // 0: services.tasks_svc.v1.GetPatientResponse.room:type_name -> services.tasks_svc.v1.GetPatientResponse.Room
-	27, // 1: services.tasks_svc.v1.GetPatientResponse.bed:type_name -> services.tasks_svc.v1.GetPatientResponse.Bed
-	28, // 2: services.tasks_svc.v1.GetPatientsByWardResponse.patients:type_name -> services.tasks_svc.v1.GetPatientsByWardResponse.Patient
-	29, // 3: services.tasks_svc.v1.GetPatientAssignmentByWardResponse.rooms:type_name -> services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room
-	34, // 4: services.tasks_svc.v1.GetPatientDetailsResponse.tasks:type_name -> services.tasks_svc.v1.GetPatientDetailsResponse.Task
-	32, // 5: services.tasks_svc.v1.GetPatientDetailsResponse.room:type_name -> services.tasks_svc.v1.GetPatientDetailsResponse.Room
-	33, // 6: services.tasks_svc.v1.GetPatientDetailsResponse.bed:type_name -> services.tasks_svc.v1.GetPatientDetailsResponse.Bed
-	38, // 7: services.tasks_svc.v1.GetPatientListResponse.active:type_name -> services.tasks_svc.v1.GetPatientListResponse.Patient
-	38, // 8: services.tasks_svc.v1.GetPatientListResponse.unassigned_patients:type_name -> services.tasks_svc.v1.GetPatientListResponse.Patient
-	38, // 9: services.tasks_svc.v1.GetPatientListResponse.discharged_patients:type_name -> services.tasks_svc.v1.GetPatientListResponse.Patient
-	43, // 10: services.tasks_svc.v1.GetRecentPatientsResponse.recent_patients:type_name -> services.tasks_svc.v1.GetRecentPatientsResponse.PatientWithRoomAndBed
-	30, // 11: services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.beds:type_name -> services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.Bed
-	31, // 12: services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.Bed.patient:type_name -> services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.Bed.Patient
-	44, // 13: services.tasks_svc.v1.GetPatientDetailsResponse.Task.status:type_name -> services.tasks_svc.v1.TaskStatus
-	35, // 14: services.tasks_svc.v1.GetPatientDetailsResponse.Task.subtasks:type_name -> services.tasks_svc.v1.GetPatientDetailsResponse.Task.SubTask
-	37, // 15: services.tasks_svc.v1.GetPatientListResponse.Patient.room:type_name -> services.tasks_svc.v1.GetPatientListResponse.Room
-	36, // 16: services.tasks_svc.v1.GetPatientListResponse.Patient.bed:type_name -> services.tasks_svc.v1.GetPatientListResponse.Bed
-	39, // 17: services.tasks_svc.v1.GetPatientListResponse.Patient.tasks:type_name -> services.tasks_svc.v1.GetPatientListResponse.Task
-	44, // 18: services.tasks_svc.v1.GetPatientListResponse.Task.status:type_name -> services.tasks_svc.v1.TaskStatus
-	40, // 19: services.tasks_svc.v1.GetPatientListResponse.Task.subtasks:type_name -> services.tasks_svc.v1.GetPatientListResponse.Task.SubTask
-	42, // 20: services.tasks_svc.v1.GetRecentPatientsResponse.PatientWithRoomAndBed.room:type_name -> services.tasks_svc.v1.GetRecentPatientsResponse.Room
-	41, // 21: services.tasks_svc.v1.GetRecentPatientsResponse.PatientWithRoomAndBed.bed:type_name -> services.tasks_svc.v1.GetRecentPatientsResponse.Bed
+	28, // 0: services.tasks_svc.v1.GetPatientResponse.room:type_name -> services.tasks_svc.v1.GetPatientResponse.Room
+	29, // 1: services.tasks_svc.v1.GetPatientResponse.bed:type_name -> services.tasks_svc.v1.GetPatientResponse.Bed
+	30, // 2: services.tasks_svc.v1.GetPatientsByWardResponse.patients:type_name -> services.tasks_svc.v1.GetPatientsByWardResponse.Patient
+	31, // 3: services.tasks_svc.v1.GetPatientAssignmentByWardResponse.rooms:type_name -> services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room
+	36, // 4: services.tasks_svc.v1.GetPatientDetailsResponse.tasks:type_name -> services.tasks_svc.v1.GetPatientDetailsResponse.Task
+	34, // 5: services.tasks_svc.v1.GetPatientDetailsResponse.room:type_name -> services.tasks_svc.v1.GetPatientDetailsResponse.Room
+	35, // 6: services.tasks_svc.v1.GetPatientDetailsResponse.bed:type_name -> services.tasks_svc.v1.GetPatientDetailsResponse.Bed
+	40, // 7: services.tasks_svc.v1.GetPatientListResponse.active:type_name -> services.tasks_svc.v1.GetPatientListResponse.Patient
+	40, // 8: services.tasks_svc.v1.GetPatientListResponse.unassigned_patients:type_name -> services.tasks_svc.v1.GetPatientListResponse.Patient
+	40, // 9: services.tasks_svc.v1.GetPatientListResponse.discharged_patients:type_name -> services.tasks_svc.v1.GetPatientListResponse.Patient
+	45, // 10: services.tasks_svc.v1.GetRecentPatientsResponse.recent_patients:type_name -> services.tasks_svc.v1.GetRecentPatientsResponse.PatientWithRoomAndBed
+	32, // 11: services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.beds:type_name -> services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.Bed
+	33, // 12: services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.Bed.patient:type_name -> services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.Bed.Patient
+	46, // 13: services.tasks_svc.v1.GetPatientDetailsResponse.Task.status:type_name -> services.tasks_svc.v1.TaskStatus
+	37, // 14: services.tasks_svc.v1.GetPatientDetailsResponse.Task.subtasks:type_name -> services.tasks_svc.v1.GetPatientDetailsResponse.Task.SubTask
+	39, // 15: services.tasks_svc.v1.GetPatientListResponse.Patient.room:type_name -> services.tasks_svc.v1.GetPatientListResponse.Room
+	38, // 16: services.tasks_svc.v1.GetPatientListResponse.Patient.bed:type_name -> services.tasks_svc.v1.GetPatientListResponse.Bed
+	41, // 17: services.tasks_svc.v1.GetPatientListResponse.Patient.tasks:type_name -> services.tasks_svc.v1.GetPatientListResponse.Task
+	46, // 18: services.tasks_svc.v1.GetPatientListResponse.Task.status:type_name -> services.tasks_svc.v1.TaskStatus
+	42, // 19: services.tasks_svc.v1.GetPatientListResponse.Task.subtasks:type_name -> services.tasks_svc.v1.GetPatientListResponse.Task.SubTask
+	44, // 20: services.tasks_svc.v1.GetRecentPatientsResponse.PatientWithRoomAndBed.room:type_name -> services.tasks_svc.v1.GetRecentPatientsResponse.Room
+	43, // 21: services.tasks_svc.v1.GetRecentPatientsResponse.PatientWithRoomAndBed.bed:type_name -> services.tasks_svc.v1.GetRecentPatientsResponse.Bed
 	0,  // 22: services.tasks_svc.v1.PatientService.CreatePatient:input_type -> services.tasks_svc.v1.CreatePatientRequest
 	2,  // 23: services.tasks_svc.v1.PatientService.GetPatient:input_type -> services.tasks_svc.v1.GetPatientRequest
 	4,  // 24: services.tasks_svc.v1.PatientService.GetPatientByBed:input_type -> services.tasks_svc.v1.GetPatientByBedRequest
@@ -3097,21 +3194,23 @@ var file_services_tasks_svc_v1_patient_svc_proto_depIdxs = []int32{
 	20, // 32: services.tasks_svc.v1.PatientService.UnassignBed:input_type -> services.tasks_svc.v1.UnassignBedRequest
 	22, // 33: services.tasks_svc.v1.PatientService.DischargePatient:input_type -> services.tasks_svc.v1.DischargePatientRequest
 	24, // 34: services.tasks_svc.v1.PatientService.ReadmitPatient:input_type -> services.tasks_svc.v1.ReadmitPatientRequest
-	1,  // 35: services.tasks_svc.v1.PatientService.CreatePatient:output_type -> services.tasks_svc.v1.CreatePatientResponse
-	3,  // 36: services.tasks_svc.v1.PatientService.GetPatient:output_type -> services.tasks_svc.v1.GetPatientResponse
-	5,  // 37: services.tasks_svc.v1.PatientService.GetPatientByBed:output_type -> services.tasks_svc.v1.GetPatientByBedResponse
-	7,  // 38: services.tasks_svc.v1.PatientService.GetPatientsByWard:output_type -> services.tasks_svc.v1.GetPatientsByWardResponse
-	9,  // 39: services.tasks_svc.v1.PatientService.GetPatientAssignmentByWard:output_type -> services.tasks_svc.v1.GetPatientAssignmentByWardResponse
-	11, // 40: services.tasks_svc.v1.PatientService.GetPatientDetails:output_type -> services.tasks_svc.v1.GetPatientDetailsResponse
-	13, // 41: services.tasks_svc.v1.PatientService.GetPatientList:output_type -> services.tasks_svc.v1.GetPatientListResponse
-	15, // 42: services.tasks_svc.v1.PatientService.GetRecentPatients:output_type -> services.tasks_svc.v1.GetRecentPatientsResponse
-	17, // 43: services.tasks_svc.v1.PatientService.UpdatePatient:output_type -> services.tasks_svc.v1.UpdatePatientResponse
-	19, // 44: services.tasks_svc.v1.PatientService.AssignBed:output_type -> services.tasks_svc.v1.AssignBedResponse
-	21, // 45: services.tasks_svc.v1.PatientService.UnassignBed:output_type -> services.tasks_svc.v1.UnassignBedResponse
-	23, // 46: services.tasks_svc.v1.PatientService.DischargePatient:output_type -> services.tasks_svc.v1.DischargePatientResponse
-	25, // 47: services.tasks_svc.v1.PatientService.ReadmitPatient:output_type -> services.tasks_svc.v1.ReadmitPatientResponse
-	35, // [35:48] is the sub-list for method output_type
-	22, // [22:35] is the sub-list for method input_type
+	26, // 35: services.tasks_svc.v1.PatientService.DeletePatient:input_type -> services.tasks_svc.v1.DeletePatientRequest
+	1,  // 36: services.tasks_svc.v1.PatientService.CreatePatient:output_type -> services.tasks_svc.v1.CreatePatientResponse
+	3,  // 37: services.tasks_svc.v1.PatientService.GetPatient:output_type -> services.tasks_svc.v1.GetPatientResponse
+	5,  // 38: services.tasks_svc.v1.PatientService.GetPatientByBed:output_type -> services.tasks_svc.v1.GetPatientByBedResponse
+	7,  // 39: services.tasks_svc.v1.PatientService.GetPatientsByWard:output_type -> services.tasks_svc.v1.GetPatientsByWardResponse
+	9,  // 40: services.tasks_svc.v1.PatientService.GetPatientAssignmentByWard:output_type -> services.tasks_svc.v1.GetPatientAssignmentByWardResponse
+	11, // 41: services.tasks_svc.v1.PatientService.GetPatientDetails:output_type -> services.tasks_svc.v1.GetPatientDetailsResponse
+	13, // 42: services.tasks_svc.v1.PatientService.GetPatientList:output_type -> services.tasks_svc.v1.GetPatientListResponse
+	15, // 43: services.tasks_svc.v1.PatientService.GetRecentPatients:output_type -> services.tasks_svc.v1.GetRecentPatientsResponse
+	17, // 44: services.tasks_svc.v1.PatientService.UpdatePatient:output_type -> services.tasks_svc.v1.UpdatePatientResponse
+	19, // 45: services.tasks_svc.v1.PatientService.AssignBed:output_type -> services.tasks_svc.v1.AssignBedResponse
+	21, // 46: services.tasks_svc.v1.PatientService.UnassignBed:output_type -> services.tasks_svc.v1.UnassignBedResponse
+	23, // 47: services.tasks_svc.v1.PatientService.DischargePatient:output_type -> services.tasks_svc.v1.DischargePatientResponse
+	25, // 48: services.tasks_svc.v1.PatientService.ReadmitPatient:output_type -> services.tasks_svc.v1.ReadmitPatientResponse
+	27, // 49: services.tasks_svc.v1.PatientService.DeletePatient:output_type -> services.tasks_svc.v1.DeletePatientResponse
+	36, // [36:50] is the sub-list for method output_type
+	22, // [22:36] is the sub-list for method input_type
 	22, // [22:22] is the sub-list for extension type_name
 	22, // [22:22] is the sub-list for extension extendee
 	0,  // [0:22] is the sub-list for field type_name
@@ -3437,7 +3536,7 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetPatientResponse_Room); i {
+			switch v := v.(*DeletePatientRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3449,7 +3548,7 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetPatientResponse_Bed); i {
+			switch v := v.(*DeletePatientResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3461,7 +3560,7 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetPatientsByWardResponse_Patient); i {
+			switch v := v.(*GetPatientResponse_Room); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3473,7 +3572,7 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetPatientAssignmentByWardResponse_Room); i {
+			switch v := v.(*GetPatientResponse_Bed); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3485,7 +3584,7 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetPatientAssignmentByWardResponse_Room_Bed); i {
+			switch v := v.(*GetPatientsByWardResponse_Patient); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3497,7 +3596,7 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetPatientAssignmentByWardResponse_Room_Bed_Patient); i {
+			switch v := v.(*GetPatientAssignmentByWardResponse_Room); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3509,7 +3608,7 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetPatientDetailsResponse_Room); i {
+			switch v := v.(*GetPatientAssignmentByWardResponse_Room_Bed); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3521,7 +3620,7 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetPatientDetailsResponse_Bed); i {
+			switch v := v.(*GetPatientAssignmentByWardResponse_Room_Bed_Patient); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3533,7 +3632,7 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetPatientDetailsResponse_Task); i {
+			switch v := v.(*GetPatientDetailsResponse_Room); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3545,7 +3644,7 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetPatientDetailsResponse_Task_SubTask); i {
+			switch v := v.(*GetPatientDetailsResponse_Bed); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3557,7 +3656,7 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetPatientListResponse_Bed); i {
+			switch v := v.(*GetPatientDetailsResponse_Task); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3569,7 +3668,7 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetPatientListResponse_Room); i {
+			switch v := v.(*GetPatientDetailsResponse_Task_SubTask); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3581,7 +3680,7 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetPatientListResponse_Patient); i {
+			switch v := v.(*GetPatientListResponse_Bed); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3593,7 +3692,7 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetPatientListResponse_Task); i {
+			switch v := v.(*GetPatientListResponse_Room); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3605,7 +3704,7 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetPatientListResponse_Task_SubTask); i {
+			switch v := v.(*GetPatientListResponse_Patient); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3617,7 +3716,7 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetRecentPatientsResponse_Bed); i {
+			switch v := v.(*GetPatientListResponse_Task); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3629,7 +3728,7 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetRecentPatientsResponse_Room); i {
+			switch v := v.(*GetPatientListResponse_Task_SubTask); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3641,6 +3740,30 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GetRecentPatientsResponse_Bed); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GetRecentPatientsResponse_Room); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_services_tasks_svc_v1_patient_svc_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetRecentPatientsResponse_PatientWithRoomAndBed); i {
 			case 0:
 				return &v.state
@@ -3659,17 +3782,17 @@ func file_services_tasks_svc_v1_patient_svc_proto_init() {
 	file_services_tasks_svc_v1_patient_svc_proto_msgTypes[11].OneofWrappers = []interface{}{}
 	file_services_tasks_svc_v1_patient_svc_proto_msgTypes[12].OneofWrappers = []interface{}{}
 	file_services_tasks_svc_v1_patient_svc_proto_msgTypes[16].OneofWrappers = []interface{}{}
-	file_services_tasks_svc_v1_patient_svc_proto_msgTypes[28].OneofWrappers = []interface{}{}
 	file_services_tasks_svc_v1_patient_svc_proto_msgTypes[30].OneofWrappers = []interface{}{}
-	file_services_tasks_svc_v1_patient_svc_proto_msgTypes[34].OneofWrappers = []interface{}{}
-	file_services_tasks_svc_v1_patient_svc_proto_msgTypes[39].OneofWrappers = []interface{}{}
+	file_services_tasks_svc_v1_patient_svc_proto_msgTypes[32].OneofWrappers = []interface{}{}
+	file_services_tasks_svc_v1_patient_svc_proto_msgTypes[36].OneofWrappers = []interface{}{}
+	file_services_tasks_svc_v1_patient_svc_proto_msgTypes[41].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_services_tasks_svc_v1_patient_svc_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   44,
+			NumMessages:   46,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/gen/go/services/tasks_svc/v1/patient_svc_grpc.pb.go b/gen/go/services/tasks_svc/v1/patient_svc_grpc.pb.go
index 0ae41d08a..d6c71606f 100644
--- a/gen/go/services/tasks_svc/v1/patient_svc_grpc.pb.go
+++ b/gen/go/services/tasks_svc/v1/patient_svc_grpc.pb.go
@@ -32,6 +32,7 @@ const (
 	PatientService_UnassignBed_FullMethodName                = "/services.tasks_svc.v1.PatientService/UnassignBed"
 	PatientService_DischargePatient_FullMethodName           = "/services.tasks_svc.v1.PatientService/DischargePatient"
 	PatientService_ReadmitPatient_FullMethodName             = "/services.tasks_svc.v1.PatientService/ReadmitPatient"
+	PatientService_DeletePatient_FullMethodName              = "/services.tasks_svc.v1.PatientService/DeletePatient"
 )
 
 // PatientServiceClient is the client API for PatientService service.
@@ -51,6 +52,7 @@ type PatientServiceClient interface {
 	UnassignBed(ctx context.Context, in *UnassignBedRequest, opts ...grpc.CallOption) (*UnassignBedResponse, error)
 	DischargePatient(ctx context.Context, in *DischargePatientRequest, opts ...grpc.CallOption) (*DischargePatientResponse, error)
 	ReadmitPatient(ctx context.Context, in *ReadmitPatientRequest, opts ...grpc.CallOption) (*ReadmitPatientResponse, error)
+	DeletePatient(ctx context.Context, in *DeletePatientRequest, opts ...grpc.CallOption) (*DeletePatientResponse, error)
 }
 
 type patientServiceClient struct {
@@ -191,6 +193,16 @@ func (c *patientServiceClient) ReadmitPatient(ctx context.Context, in *ReadmitPa
 	return out, nil
 }
 
+func (c *patientServiceClient) DeletePatient(ctx context.Context, in *DeletePatientRequest, opts ...grpc.CallOption) (*DeletePatientResponse, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(DeletePatientResponse)
+	err := c.cc.Invoke(ctx, PatientService_DeletePatient_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // PatientServiceServer is the server API for PatientService service.
 // All implementations must embed UnimplementedPatientServiceServer
 // for forward compatibility
@@ -208,6 +220,7 @@ type PatientServiceServer interface {
 	UnassignBed(context.Context, *UnassignBedRequest) (*UnassignBedResponse, error)
 	DischargePatient(context.Context, *DischargePatientRequest) (*DischargePatientResponse, error)
 	ReadmitPatient(context.Context, *ReadmitPatientRequest) (*ReadmitPatientResponse, error)
+	DeletePatient(context.Context, *DeletePatientRequest) (*DeletePatientResponse, error)
 	mustEmbedUnimplementedPatientServiceServer()
 }
 
@@ -254,6 +267,9 @@ func (UnimplementedPatientServiceServer) DischargePatient(context.Context, *Disc
 func (UnimplementedPatientServiceServer) ReadmitPatient(context.Context, *ReadmitPatientRequest) (*ReadmitPatientResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ReadmitPatient not implemented")
 }
+func (UnimplementedPatientServiceServer) DeletePatient(context.Context, *DeletePatientRequest) (*DeletePatientResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method DeletePatient not implemented")
+}
 func (UnimplementedPatientServiceServer) mustEmbedUnimplementedPatientServiceServer() {}
 
 // UnsafePatientServiceServer may be embedded to opt out of forward compatibility for this service.
@@ -501,6 +517,24 @@ func _PatientService_ReadmitPatient_Handler(srv interface{}, ctx context.Context
 	return interceptor(ctx, in, info, handler)
 }
 
+func _PatientService_DeletePatient_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeletePatientRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PatientServiceServer).DeletePatient(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: PatientService_DeletePatient_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PatientServiceServer).DeletePatient(ctx, req.(*DeletePatientRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // PatientService_ServiceDesc is the grpc.ServiceDesc for PatientService service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -560,6 +594,10 @@ var PatientService_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "ReadmitPatient",
 			Handler:    _PatientService_ReadmitPatient_Handler,
 		},
+		{
+			MethodName: "DeletePatient",
+			Handler:    _PatientService_DeletePatient_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "services/tasks_svc/v1/patient_svc.proto",
diff --git a/gen/go/services/tasks_svc/v1/room_svc.pb.go b/gen/go/services/tasks_svc/v1/room_svc.pb.go
index 8aa42e78b..d62c97864 100644
--- a/gen/go/services/tasks_svc/v1/room_svc.pb.go
+++ b/gen/go/services/tasks_svc/v1/room_svc.pb.go
@@ -244,6 +244,8 @@ type GetRoomsRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
+	WardId *string `protobuf:"bytes,1,opt,name=ward_id,json=wardId,proto3,oneof" json:"ward_id,omitempty" validate:"uuid4"` // @gotags: validate:"uuid4"
 }
 
 func (x *GetRoomsRequest) Reset() {
@@ -278,6 +280,13 @@ func (*GetRoomsRequest) Descriptor() ([]byte, []int) {
 	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{4}
 }
 
+func (x *GetRoomsRequest) GetWardId() string {
+	if x != nil && x.WardId != nil {
+		return *x.WardId
+	}
+	return ""
+}
+
 type GetRoomsResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -325,100 +334,6 @@ func (x *GetRoomsResponse) GetRooms() []*GetRoomsResponse_Room {
 	return nil
 }
 
-type GetRoomsByWardRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	WardId string `protobuf:"bytes,1,opt,name=ward_id,json=wardId,proto3" json:"ward_id,omitempty" validate:"uuid4"` // @gotags: validate:"uuid4"
-}
-
-func (x *GetRoomsByWardRequest) Reset() {
-	*x = GetRoomsByWardRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetRoomsByWardRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetRoomsByWardRequest) ProtoMessage() {}
-
-func (x *GetRoomsByWardRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetRoomsByWardRequest.ProtoReflect.Descriptor instead.
-func (*GetRoomsByWardRequest) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *GetRoomsByWardRequest) GetWardId() string {
-	if x != nil {
-		return x.WardId
-	}
-	return ""
-}
-
-type GetRoomsByWardResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Rooms []*GetRoomsByWardResponse_Room `protobuf:"bytes,1,rep,name=rooms,proto3" json:"rooms,omitempty"`
-}
-
-func (x *GetRoomsByWardResponse) Reset() {
-	*x = GetRoomsByWardResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetRoomsByWardResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetRoomsByWardResponse) ProtoMessage() {}
-
-func (x *GetRoomsByWardResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetRoomsByWardResponse.ProtoReflect.Descriptor instead.
-func (*GetRoomsByWardResponse) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *GetRoomsByWardResponse) GetRooms() []*GetRoomsByWardResponse_Room {
-	if x != nil {
-		return x.Rooms
-	}
-	return nil
-}
-
 type UpdateRoomRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -431,7 +346,7 @@ type UpdateRoomRequest struct {
 func (x *UpdateRoomRequest) Reset() {
 	*x = UpdateRoomRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[8]
+		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -444,7 +359,7 @@ func (x *UpdateRoomRequest) String() string {
 func (*UpdateRoomRequest) ProtoMessage() {}
 
 func (x *UpdateRoomRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[8]
+	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -457,7 +372,7 @@ func (x *UpdateRoomRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateRoomRequest.ProtoReflect.Descriptor instead.
 func (*UpdateRoomRequest) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{8}
+	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *UpdateRoomRequest) GetId() string {
@@ -483,7 +398,7 @@ type UpdateRoomResponse struct {
 func (x *UpdateRoomResponse) Reset() {
 	*x = UpdateRoomResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[9]
+		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -496,7 +411,7 @@ func (x *UpdateRoomResponse) String() string {
 func (*UpdateRoomResponse) ProtoMessage() {}
 
 func (x *UpdateRoomResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[9]
+	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -509,7 +424,7 @@ func (x *UpdateRoomResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateRoomResponse.ProtoReflect.Descriptor instead.
 func (*UpdateRoomResponse) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{9}
+	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{7}
 }
 
 type DeleteRoomRequest struct {
@@ -523,7 +438,7 @@ type DeleteRoomRequest struct {
 func (x *DeleteRoomRequest) Reset() {
 	*x = DeleteRoomRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[10]
+		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -536,7 +451,7 @@ func (x *DeleteRoomRequest) String() string {
 func (*DeleteRoomRequest) ProtoMessage() {}
 
 func (x *DeleteRoomRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[10]
+	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -549,7 +464,7 @@ func (x *DeleteRoomRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteRoomRequest.ProtoReflect.Descriptor instead.
 func (*DeleteRoomRequest) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{10}
+	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *DeleteRoomRequest) GetId() string {
@@ -568,7 +483,7 @@ type DeleteRoomResponse struct {
 func (x *DeleteRoomResponse) Reset() {
 	*x = DeleteRoomResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[11]
+		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -581,7 +496,7 @@ func (x *DeleteRoomResponse) String() string {
 func (*DeleteRoomResponse) ProtoMessage() {}
 
 func (x *DeleteRoomResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[11]
+	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -594,7 +509,7 @@ func (x *DeleteRoomResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteRoomResponse.ProtoReflect.Descriptor instead.
 func (*DeleteRoomResponse) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{11}
+	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{9}
 }
 
 type GetRoomOverviewsByWardRequest struct {
@@ -608,7 +523,7 @@ type GetRoomOverviewsByWardRequest struct {
 func (x *GetRoomOverviewsByWardRequest) Reset() {
 	*x = GetRoomOverviewsByWardRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[12]
+		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -621,7 +536,7 @@ func (x *GetRoomOverviewsByWardRequest) String() string {
 func (*GetRoomOverviewsByWardRequest) ProtoMessage() {}
 
 func (x *GetRoomOverviewsByWardRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[12]
+	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -634,7 +549,7 @@ func (x *GetRoomOverviewsByWardRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetRoomOverviewsByWardRequest.ProtoReflect.Descriptor instead.
 func (*GetRoomOverviewsByWardRequest) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{12}
+	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *GetRoomOverviewsByWardRequest) GetId() string {
@@ -655,7 +570,7 @@ type GetRoomOverviewsByWardResponse struct {
 func (x *GetRoomOverviewsByWardResponse) Reset() {
 	*x = GetRoomOverviewsByWardResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[13]
+		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -668,7 +583,7 @@ func (x *GetRoomOverviewsByWardResponse) String() string {
 func (*GetRoomOverviewsByWardResponse) ProtoMessage() {}
 
 func (x *GetRoomOverviewsByWardResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[13]
+	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -681,7 +596,7 @@ func (x *GetRoomOverviewsByWardResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetRoomOverviewsByWardResponse.ProtoReflect.Descriptor instead.
 func (*GetRoomOverviewsByWardResponse) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{13}
+	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *GetRoomOverviewsByWardResponse) GetRooms() []*GetRoomOverviewsByWardResponse_Room {
@@ -703,7 +618,7 @@ type GetRoomResponse_Bed struct {
 func (x *GetRoomResponse_Bed) Reset() {
 	*x = GetRoomResponse_Bed{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[14]
+		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -716,7 +631,7 @@ func (x *GetRoomResponse_Bed) String() string {
 func (*GetRoomResponse_Bed) ProtoMessage() {}
 
 func (x *GetRoomResponse_Bed) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[14]
+	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -760,7 +675,7 @@ type GetRoomsResponse_Room struct {
 func (x *GetRoomsResponse_Room) Reset() {
 	*x = GetRoomsResponse_Room{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[15]
+		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -773,7 +688,7 @@ func (x *GetRoomsResponse_Room) String() string {
 func (*GetRoomsResponse_Room) ProtoMessage() {}
 
 func (x *GetRoomsResponse_Room) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[15]
+	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -829,7 +744,7 @@ type GetRoomsResponse_Room_Bed struct {
 func (x *GetRoomsResponse_Room_Bed) Reset() {
 	*x = GetRoomsResponse_Room_Bed{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[16]
+		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -842,7 +757,7 @@ func (x *GetRoomsResponse_Room_Bed) String() string {
 func (*GetRoomsResponse_Room_Bed) ProtoMessage() {}
 
 func (x *GetRoomsResponse_Room_Bed) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[16]
+	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -872,132 +787,6 @@ func (x *GetRoomsResponse_Room_Bed) GetName() string {
 	return ""
 }
 
-type GetRoomsByWardResponse_Room struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id     string                             `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Name   string                             `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	Beds   []*GetRoomsByWardResponse_Room_Bed `protobuf:"bytes,3,rep,name=beds,proto3" json:"beds,omitempty"`
-	WardId string                             `protobuf:"bytes,5,opt,name=ward_id,json=wardId,proto3" json:"ward_id,omitempty"`
-}
-
-func (x *GetRoomsByWardResponse_Room) Reset() {
-	*x = GetRoomsByWardResponse_Room{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[17]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetRoomsByWardResponse_Room) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetRoomsByWardResponse_Room) ProtoMessage() {}
-
-func (x *GetRoomsByWardResponse_Room) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[17]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetRoomsByWardResponse_Room.ProtoReflect.Descriptor instead.
-func (*GetRoomsByWardResponse_Room) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{7, 0}
-}
-
-func (x *GetRoomsByWardResponse_Room) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *GetRoomsByWardResponse_Room) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *GetRoomsByWardResponse_Room) GetBeds() []*GetRoomsByWardResponse_Room_Bed {
-	if x != nil {
-		return x.Beds
-	}
-	return nil
-}
-
-func (x *GetRoomsByWardResponse_Room) GetWardId() string {
-	if x != nil {
-		return x.WardId
-	}
-	return ""
-}
-
-type GetRoomsByWardResponse_Room_Bed struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id   string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-}
-
-func (x *GetRoomsByWardResponse_Room_Bed) Reset() {
-	*x = GetRoomsByWardResponse_Room_Bed{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[18]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetRoomsByWardResponse_Room_Bed) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetRoomsByWardResponse_Room_Bed) ProtoMessage() {}
-
-func (x *GetRoomsByWardResponse_Room_Bed) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[18]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetRoomsByWardResponse_Room_Bed.ProtoReflect.Descriptor instead.
-func (*GetRoomsByWardResponse_Room_Bed) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{7, 0, 0}
-}
-
-func (x *GetRoomsByWardResponse_Room_Bed) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *GetRoomsByWardResponse_Room_Bed) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
 type GetRoomOverviewsByWardResponse_Room struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1011,7 +800,7 @@ type GetRoomOverviewsByWardResponse_Room struct {
 func (x *GetRoomOverviewsByWardResponse_Room) Reset() {
 	*x = GetRoomOverviewsByWardResponse_Room{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[19]
+		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1024,7 +813,7 @@ func (x *GetRoomOverviewsByWardResponse_Room) String() string {
 func (*GetRoomOverviewsByWardResponse_Room) ProtoMessage() {}
 
 func (x *GetRoomOverviewsByWardResponse_Room) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[19]
+	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1037,7 +826,7 @@ func (x *GetRoomOverviewsByWardResponse_Room) ProtoReflect() protoreflect.Messag
 
 // Deprecated: Use GetRoomOverviewsByWardResponse_Room.ProtoReflect.Descriptor instead.
 func (*GetRoomOverviewsByWardResponse_Room) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{13, 0}
+	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{11, 0}
 }
 
 func (x *GetRoomOverviewsByWardResponse_Room) GetId() string {
@@ -1074,7 +863,7 @@ type GetRoomOverviewsByWardResponse_Room_Bed struct {
 func (x *GetRoomOverviewsByWardResponse_Room_Bed) Reset() {
 	*x = GetRoomOverviewsByWardResponse_Room_Bed{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[20]
+		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1087,7 +876,7 @@ func (x *GetRoomOverviewsByWardResponse_Room_Bed) String() string {
 func (*GetRoomOverviewsByWardResponse_Room_Bed) ProtoMessage() {}
 
 func (x *GetRoomOverviewsByWardResponse_Room_Bed) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[20]
+	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1100,7 +889,7 @@ func (x *GetRoomOverviewsByWardResponse_Room_Bed) ProtoReflect() protoreflect.Me
 
 // Deprecated: Use GetRoomOverviewsByWardResponse_Room_Bed.ProtoReflect.Descriptor instead.
 func (*GetRoomOverviewsByWardResponse_Room_Bed) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{13, 0, 0}
+	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{11, 0, 0}
 }
 
 func (x *GetRoomOverviewsByWardResponse_Room_Bed) GetId() string {
@@ -1139,7 +928,7 @@ type GetRoomOverviewsByWardResponse_Room_Bed_Patient struct {
 func (x *GetRoomOverviewsByWardResponse_Room_Bed_Patient) Reset() {
 	*x = GetRoomOverviewsByWardResponse_Room_Bed_Patient{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[21]
+		mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1152,7 +941,7 @@ func (x *GetRoomOverviewsByWardResponse_Room_Bed_Patient) String() string {
 func (*GetRoomOverviewsByWardResponse_Room_Bed_Patient) ProtoMessage() {}
 
 func (x *GetRoomOverviewsByWardResponse_Room_Bed_Patient) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[21]
+	mi := &file_services_tasks_svc_v1_room_svc_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1165,7 +954,7 @@ func (x *GetRoomOverviewsByWardResponse_Room_Bed_Patient) ProtoReflect() protore
 
 // Deprecated: Use GetRoomOverviewsByWardResponse_Room_Bed_Patient.ProtoReflect.Descriptor instead.
 func (*GetRoomOverviewsByWardResponse_Room_Bed_Patient) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{13, 0, 0, 0}
+	return file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP(), []int{11, 0, 0, 0}
 }
 
 func (x *GetRoomOverviewsByWardResponse_Room_Bed_Patient) GetId() string {
@@ -1230,157 +1019,131 @@ var file_services_tasks_svc_v1_room_svc_proto_rawDesc = []byte{
 	0x52, 0x06, 0x77, 0x61, 0x72, 0x64, 0x49, 0x64, 0x1a, 0x29, 0x0a, 0x03, 0x42, 0x65, 0x64, 0x12,
 	0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12,
 	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x22, 0x11, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x8d, 0x02, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x52, 0x6f,
-	0x6f, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x42, 0x0a, 0x05, 0x72,
-	0x6f, 0x6f, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e,
-	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x1a,
-	0xb4, 0x01, 0x0a, 0x04, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x44, 0x0a, 0x04,
-	0x62, 0x65, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e,
-	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x42, 0x65, 0x64, 0x52, 0x04, 0x62, 0x65,
-	0x64, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x06, 0x77, 0x61, 0x72, 0x64, 0x49, 0x64, 0x1a, 0x29, 0x0a, 0x03, 0x42,
-	0x65, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
+	0x61, 0x6d, 0x65, 0x22, 0x3b, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x73, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x07, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x06, 0x77, 0x61, 0x72, 0x64, 0x49,
+	0x64, 0x88, 0x01, 0x01, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x69, 0x64,
+	0x22, 0x8d, 0x02, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x42, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e,
+	0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
+	0x52, 0x6f, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f,
+	0x6f, 0x6d, 0x52, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x1a, 0xb4, 0x01, 0x0a, 0x04, 0x52, 0x6f,
+	0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
 	0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x30, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f,
-	0x6d, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x17, 0x0a, 0x07, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x06, 0x77, 0x61, 0x72, 0x64, 0x49, 0x64, 0x22, 0x9f, 0x02, 0x0a, 0x16, 0x47, 0x65, 0x74,
-	0x52, 0x6f, 0x6f, 0x6d, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x48, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x32, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61,
-	0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f,
-	0x6f, 0x6d, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x1a, 0xba, 0x01,
-	0x0a, 0x04, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x4a, 0x0a, 0x04, 0x62, 0x65,
-	0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31,
-	0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x42, 0x65, 0x64,
-	0x52, 0x04, 0x62, 0x65, 0x64, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x69,
-	0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x77, 0x61, 0x72, 0x64, 0x49, 0x64, 0x1a,
-	0x29, 0x0a, 0x03, 0x42, 0x65, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x45, 0x0a, 0x11, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12,
-	0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6e, 0x61, 0x6d,
-	0x65, 0x22, 0x14, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x23, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x65, 0x74,
-	0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x14, 0x0a, 0x12,
-	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x2f, 0x0a, 0x1d, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4f, 0x76, 0x65,
-	0x72, 0x76, 0x69, 0x65, 0x77, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x02, 0x69, 0x64, 0x22, 0xe2, 0x04, 0x0a, 0x1e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4f,
-	0x76, 0x65, 0x72, 0x76, 0x69, 0x65, 0x77, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x50, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
-	0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65,
-	0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4f, 0x76, 0x65, 0x72, 0x76, 0x69, 0x65, 0x77, 0x73, 0x42, 0x79,
-	0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f, 0x6f,
-	0x6d, 0x52, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x1a, 0xed, 0x03, 0x0a, 0x04, 0x52, 0x6f, 0x6f,
-	0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
-	0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x52, 0x0a, 0x04, 0x62, 0x65, 0x64, 0x73, 0x18, 0x03, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74,
-	0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52,
+	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x44, 0x0a, 0x04, 0x62, 0x65, 0x64, 0x73, 0x18, 0x03,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e,
+	0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
+	0x52, 0x6f, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f,
+	0x6f, 0x6d, 0x2e, 0x42, 0x65, 0x64, 0x52, 0x04, 0x62, 0x65, 0x64, 0x73, 0x12, 0x17, 0x0a, 0x07,
+	0x77, 0x61, 0x72, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x77,
+	0x61, 0x72, 0x64, 0x49, 0x64, 0x1a, 0x29, 0x0a, 0x03, 0x42, 0x65, 0x64, 0x12, 0x0e, 0x0a, 0x02,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x22, 0x45, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x07,
+	0x0a, 0x05, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x14, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x23, 0x0a,
+	0x11, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
+	0x69, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x0a, 0x1d, 0x47, 0x65, 0x74, 0x52,
 	0x6f, 0x6f, 0x6d, 0x4f, 0x76, 0x65, 0x72, 0x76, 0x69, 0x65, 0x77, 0x73, 0x42, 0x79, 0x57, 0x61,
-	0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x2e,
-	0x42, 0x65, 0x64, 0x52, 0x04, 0x62, 0x65, 0x64, 0x73, 0x1a, 0xec, 0x02, 0x0a, 0x03, 0x42, 0x65,
-	0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
-	0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x65, 0x0a, 0x07, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x46, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47,
-	0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4f, 0x76, 0x65, 0x72, 0x76, 0x69, 0x65, 0x77, 0x73, 0x42,
-	0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f,
-	0x6f, 0x6d, 0x2e, 0x42, 0x65, 0x64, 0x2e, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x48, 0x00,
-	0x52, 0x07, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x1a, 0xcd, 0x01, 0x0a,
-	0x07, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x3a, 0x0a, 0x19, 0x68, 0x75, 0x6d, 0x61,
-	0x6e, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74,
-	0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x17, 0x68, 0x75, 0x6d,
-	0x61, 0x6e, 0x52, 0x65, 0x61, 0x64, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69,
-	0x66, 0x69, 0x65, 0x72, 0x12, 0x2b, 0x0a, 0x11, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x75, 0x6e,
-	0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x10, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x55, 0x6e, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65,
-	0x64, 0x12, 0x2a, 0x0a, 0x11, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x69, 0x6e, 0x5f, 0x70, 0x72,
-	0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0f, 0x74, 0x61,
-	0x73, 0x6b, 0x73, 0x49, 0x6e, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1d, 0x0a,
-	0x0a, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x64, 0x6f, 0x6e, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x0d, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x44, 0x6f, 0x6e, 0x65, 0x42, 0x0a, 0x0a, 0x08,
-	0x5f, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x32, 0xf2, 0x05, 0x0a, 0x0b, 0x52, 0x6f, 0x6f,
-	0x6d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x63, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61,
-	0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x28, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0xe2, 0x04, 0x0a, 0x1e, 0x47, 0x65,
+	0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4f, 0x76, 0x65, 0x72, 0x76, 0x69, 0x65, 0x77, 0x73, 0x42, 0x79,
+	0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x50, 0x0a, 0x05,
+	0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
+	0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4f, 0x76, 0x65, 0x72, 0x76,
+	0x69, 0x65, 0x77, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x1a, 0xed,
+	0x03, 0x0a, 0x04, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x52, 0x0a, 0x04, 0x62,
+	0x65, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x73, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76,
+	0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4f, 0x76, 0x65, 0x72, 0x76, 0x69, 0x65,
+	0x77, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x42, 0x65, 0x64, 0x52, 0x04, 0x62, 0x65, 0x64, 0x73, 0x1a,
+	0xec, 0x02, 0x0a, 0x03, 0x42, 0x65, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x65, 0x0a, 0x07, 0x70,
+	0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x46, 0x2e, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76,
+	0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4f, 0x76, 0x65, 0x72,
+	0x76, 0x69, 0x65, 0x77, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x42, 0x65, 0x64, 0x2e, 0x50, 0x61, 0x74,
+	0x69, 0x65, 0x6e, 0x74, 0x48, 0x00, 0x52, 0x07, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x88,
+	0x01, 0x01, 0x1a, 0xcd, 0x01, 0x0a, 0x07, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x0e,
+	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x3a,
+	0x0a, 0x19, 0x68, 0x75, 0x6d, 0x61, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x61, 0x62, 0x6c, 0x65,
+	0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x17, 0x68, 0x75, 0x6d, 0x61, 0x6e, 0x52, 0x65, 0x61, 0x64, 0x61, 0x62, 0x6c, 0x65,
+	0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x2b, 0x0a, 0x11, 0x74, 0x61,
+	0x73, 0x6b, 0x73, 0x5f, 0x75, 0x6e, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x64, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x10, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x55, 0x6e, 0x73, 0x63,
+	0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x64, 0x12, 0x2a, 0x0a, 0x11, 0x74, 0x61, 0x73, 0x6b, 0x73,
+	0x5f, 0x69, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x0d, 0x52, 0x0f, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x49, 0x6e, 0x50, 0x72, 0x6f, 0x67, 0x72,
+	0x65, 0x73, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x64, 0x6f, 0x6e,
+	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x44, 0x6f,
+	0x6e, 0x65, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x32, 0x81,
+	0x05, 0x0a, 0x0b, 0x52, 0x6f, 0x6f, 0x6d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x63,
+	0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x28, 0x2e, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76,
+	0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
 	0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43,
-	0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x29, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b,
-	0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52,
-	0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x5a, 0x0a,
-	0x07, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x25, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31,
-	0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x26, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73,
-	0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x5d, 0x0a, 0x08, 0x47, 0x65, 0x74,
-	0x52, 0x6f, 0x6f, 0x6d, 0x73, 0x12, 0x26, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
+	0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x00, 0x12, 0x5a, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x25,
+	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f,
+	0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
 	0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65,
-	0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73,
-	0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6f, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x52,
-	0x6f, 0x6f, 0x6d, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x12, 0x2c, 0x2e, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e,
-	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72,
-	0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31,
-	0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x0a, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x28, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x29, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73,
-	0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x63,
-	0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x28, 0x2e, 0x73,
+	0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
+	0x5d, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x73, 0x12, 0x26, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
+	0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74,
+	0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52,
+	0x6f, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x63,
+	0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x28, 0x2e, 0x73,
 	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76,
-	0x63, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52,
+	0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52,
 	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x44,
-	0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x12, 0x87, 0x01, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4f,
-	0x76, 0x65, 0x72, 0x76, 0x69, 0x65, 0x77, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x12, 0x34,
-	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f,
-	0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4f, 0x76,
-	0x65, 0x72, 0x76, 0x69, 0x65, 0x77, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x35, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e,
-	0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
+	0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x6f, 0x6f,
+	0x6d, 0x12, 0x28, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73,
+	0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
+	0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
+	0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x87, 0x01, 0x0a, 0x16, 0x47, 0x65, 0x74,
 	0x52, 0x6f, 0x6f, 0x6d, 0x4f, 0x76, 0x65, 0x72, 0x76, 0x69, 0x65, 0x77, 0x73, 0x42, 0x79, 0x57,
-	0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0xb9, 0x01,
-	0x0a, 0x19, 0x63, 0x6f, 0x6d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74,
-	0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x52, 0x6f, 0x6f,
-	0x6d, 0x53, 0x76, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x1c, 0x67, 0x65, 0x6e,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f,
-	0x74, 0x61, 0x73, 0x6b, 0x73, 0x2d, 0x73, 0x76, 0x63, 0xa2, 0x02, 0x03, 0x53, 0x54, 0x58, 0xaa,
-	0x02, 0x14, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x73,
-	0x53, 0x76, 0x63, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x14, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x73, 0x5c, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76, 0x63, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x20,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x5c, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76,
-	0x63, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
-	0xea, 0x02, 0x16, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3a, 0x3a, 0x54, 0x61, 0x73,
-	0x6b, 0x73, 0x53, 0x76, 0x63, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x61, 0x72, 0x64, 0x12, 0x34, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74,
+	0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52,
+	0x6f, 0x6f, 0x6d, 0x4f, 0x76, 0x65, 0x72, 0x76, 0x69, 0x65, 0x77, 0x73, 0x42, 0x79, 0x57, 0x61,
+	0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x35, 0x2e, 0x73, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76,
+	0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4f, 0x76, 0x65, 0x72, 0x76, 0x69, 0x65,
+	0x77, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x00, 0x42, 0xb9, 0x01, 0x0a, 0x19, 0x63, 0x6f, 0x6d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31,
+	0x42, 0x0c, 0x52, 0x6f, 0x6f, 0x6d, 0x53, 0x76, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x1c, 0x67, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x73, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2d, 0x73, 0x76, 0x63, 0xa2, 0x02,
+	0x03, 0x53, 0x54, 0x58, 0xaa, 0x02, 0x14, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e,
+	0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76, 0x63, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x14, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x5c, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76, 0x63, 0x5c,
+	0x56, 0x31, 0xe2, 0x02, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x5c, 0x54, 0x61,
+	0x73, 0x6b, 0x73, 0x53, 0x76, 0x63, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74,
+	0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x16, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
+	0x3a, 0x3a, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76, 0x63, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1395,7 +1158,7 @@ func file_services_tasks_svc_v1_room_svc_proto_rawDescGZIP() []byte {
 	return file_services_tasks_svc_v1_room_svc_proto_rawDescData
 }
 
-var file_services_tasks_svc_v1_room_svc_proto_msgTypes = make([]protoimpl.MessageInfo, 22)
+var file_services_tasks_svc_v1_room_svc_proto_msgTypes = make([]protoimpl.MessageInfo, 18)
 var file_services_tasks_svc_v1_room_svc_proto_goTypes = []interface{}{
 	(*CreateRoomRequest)(nil),                               // 0: services.tasks_svc.v1.CreateRoomRequest
 	(*CreateRoomResponse)(nil),                              // 1: services.tasks_svc.v1.CreateRoomResponse
@@ -1403,51 +1166,43 @@ var file_services_tasks_svc_v1_room_svc_proto_goTypes = []interface{}{
 	(*GetRoomResponse)(nil),                                 // 3: services.tasks_svc.v1.GetRoomResponse
 	(*GetRoomsRequest)(nil),                                 // 4: services.tasks_svc.v1.GetRoomsRequest
 	(*GetRoomsResponse)(nil),                                // 5: services.tasks_svc.v1.GetRoomsResponse
-	(*GetRoomsByWardRequest)(nil),                           // 6: services.tasks_svc.v1.GetRoomsByWardRequest
-	(*GetRoomsByWardResponse)(nil),                          // 7: services.tasks_svc.v1.GetRoomsByWardResponse
-	(*UpdateRoomRequest)(nil),                               // 8: services.tasks_svc.v1.UpdateRoomRequest
-	(*UpdateRoomResponse)(nil),                              // 9: services.tasks_svc.v1.UpdateRoomResponse
-	(*DeleteRoomRequest)(nil),                               // 10: services.tasks_svc.v1.DeleteRoomRequest
-	(*DeleteRoomResponse)(nil),                              // 11: services.tasks_svc.v1.DeleteRoomResponse
-	(*GetRoomOverviewsByWardRequest)(nil),                   // 12: services.tasks_svc.v1.GetRoomOverviewsByWardRequest
-	(*GetRoomOverviewsByWardResponse)(nil),                  // 13: services.tasks_svc.v1.GetRoomOverviewsByWardResponse
-	(*GetRoomResponse_Bed)(nil),                             // 14: services.tasks_svc.v1.GetRoomResponse.Bed
-	(*GetRoomsResponse_Room)(nil),                           // 15: services.tasks_svc.v1.GetRoomsResponse.Room
-	(*GetRoomsResponse_Room_Bed)(nil),                       // 16: services.tasks_svc.v1.GetRoomsResponse.Room.Bed
-	(*GetRoomsByWardResponse_Room)(nil),                     // 17: services.tasks_svc.v1.GetRoomsByWardResponse.Room
-	(*GetRoomsByWardResponse_Room_Bed)(nil),                 // 18: services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed
-	(*GetRoomOverviewsByWardResponse_Room)(nil),             // 19: services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room
-	(*GetRoomOverviewsByWardResponse_Room_Bed)(nil),         // 20: services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.Bed
-	(*GetRoomOverviewsByWardResponse_Room_Bed_Patient)(nil), // 21: services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.Bed.Patient
+	(*UpdateRoomRequest)(nil),                               // 6: services.tasks_svc.v1.UpdateRoomRequest
+	(*UpdateRoomResponse)(nil),                              // 7: services.tasks_svc.v1.UpdateRoomResponse
+	(*DeleteRoomRequest)(nil),                               // 8: services.tasks_svc.v1.DeleteRoomRequest
+	(*DeleteRoomResponse)(nil),                              // 9: services.tasks_svc.v1.DeleteRoomResponse
+	(*GetRoomOverviewsByWardRequest)(nil),                   // 10: services.tasks_svc.v1.GetRoomOverviewsByWardRequest
+	(*GetRoomOverviewsByWardResponse)(nil),                  // 11: services.tasks_svc.v1.GetRoomOverviewsByWardResponse
+	(*GetRoomResponse_Bed)(nil),                             // 12: services.tasks_svc.v1.GetRoomResponse.Bed
+	(*GetRoomsResponse_Room)(nil),                           // 13: services.tasks_svc.v1.GetRoomsResponse.Room
+	(*GetRoomsResponse_Room_Bed)(nil),                       // 14: services.tasks_svc.v1.GetRoomsResponse.Room.Bed
+	(*GetRoomOverviewsByWardResponse_Room)(nil),             // 15: services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room
+	(*GetRoomOverviewsByWardResponse_Room_Bed)(nil),         // 16: services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.Bed
+	(*GetRoomOverviewsByWardResponse_Room_Bed_Patient)(nil), // 17: services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.Bed.Patient
 }
 var file_services_tasks_svc_v1_room_svc_proto_depIdxs = []int32{
-	14, // 0: services.tasks_svc.v1.GetRoomResponse.beds:type_name -> services.tasks_svc.v1.GetRoomResponse.Bed
-	15, // 1: services.tasks_svc.v1.GetRoomsResponse.rooms:type_name -> services.tasks_svc.v1.GetRoomsResponse.Room
-	17, // 2: services.tasks_svc.v1.GetRoomsByWardResponse.rooms:type_name -> services.tasks_svc.v1.GetRoomsByWardResponse.Room
-	19, // 3: services.tasks_svc.v1.GetRoomOverviewsByWardResponse.rooms:type_name -> services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room
-	16, // 4: services.tasks_svc.v1.GetRoomsResponse.Room.beds:type_name -> services.tasks_svc.v1.GetRoomsResponse.Room.Bed
-	18, // 5: services.tasks_svc.v1.GetRoomsByWardResponse.Room.beds:type_name -> services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed
-	20, // 6: services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.beds:type_name -> services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.Bed
-	21, // 7: services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.Bed.patient:type_name -> services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.Bed.Patient
-	0,  // 8: services.tasks_svc.v1.RoomService.CreateRoom:input_type -> services.tasks_svc.v1.CreateRoomRequest
-	2,  // 9: services.tasks_svc.v1.RoomService.GetRoom:input_type -> services.tasks_svc.v1.GetRoomRequest
-	4,  // 10: services.tasks_svc.v1.RoomService.GetRooms:input_type -> services.tasks_svc.v1.GetRoomsRequest
-	6,  // 11: services.tasks_svc.v1.RoomService.GetRoomsByWard:input_type -> services.tasks_svc.v1.GetRoomsByWardRequest
-	8,  // 12: services.tasks_svc.v1.RoomService.UpdateRoom:input_type -> services.tasks_svc.v1.UpdateRoomRequest
-	10, // 13: services.tasks_svc.v1.RoomService.DeleteRoom:input_type -> services.tasks_svc.v1.DeleteRoomRequest
-	12, // 14: services.tasks_svc.v1.RoomService.GetRoomOverviewsByWard:input_type -> services.tasks_svc.v1.GetRoomOverviewsByWardRequest
-	1,  // 15: services.tasks_svc.v1.RoomService.CreateRoom:output_type -> services.tasks_svc.v1.CreateRoomResponse
-	3,  // 16: services.tasks_svc.v1.RoomService.GetRoom:output_type -> services.tasks_svc.v1.GetRoomResponse
-	5,  // 17: services.tasks_svc.v1.RoomService.GetRooms:output_type -> services.tasks_svc.v1.GetRoomsResponse
-	7,  // 18: services.tasks_svc.v1.RoomService.GetRoomsByWard:output_type -> services.tasks_svc.v1.GetRoomsByWardResponse
-	9,  // 19: services.tasks_svc.v1.RoomService.UpdateRoom:output_type -> services.tasks_svc.v1.UpdateRoomResponse
-	11, // 20: services.tasks_svc.v1.RoomService.DeleteRoom:output_type -> services.tasks_svc.v1.DeleteRoomResponse
-	13, // 21: services.tasks_svc.v1.RoomService.GetRoomOverviewsByWard:output_type -> services.tasks_svc.v1.GetRoomOverviewsByWardResponse
-	15, // [15:22] is the sub-list for method output_type
-	8,  // [8:15] is the sub-list for method input_type
-	8,  // [8:8] is the sub-list for extension type_name
-	8,  // [8:8] is the sub-list for extension extendee
-	0,  // [0:8] is the sub-list for field type_name
+	12, // 0: services.tasks_svc.v1.GetRoomResponse.beds:type_name -> services.tasks_svc.v1.GetRoomResponse.Bed
+	13, // 1: services.tasks_svc.v1.GetRoomsResponse.rooms:type_name -> services.tasks_svc.v1.GetRoomsResponse.Room
+	15, // 2: services.tasks_svc.v1.GetRoomOverviewsByWardResponse.rooms:type_name -> services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room
+	14, // 3: services.tasks_svc.v1.GetRoomsResponse.Room.beds:type_name -> services.tasks_svc.v1.GetRoomsResponse.Room.Bed
+	16, // 4: services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.beds:type_name -> services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.Bed
+	17, // 5: services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.Bed.patient:type_name -> services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.Bed.Patient
+	0,  // 6: services.tasks_svc.v1.RoomService.CreateRoom:input_type -> services.tasks_svc.v1.CreateRoomRequest
+	2,  // 7: services.tasks_svc.v1.RoomService.GetRoom:input_type -> services.tasks_svc.v1.GetRoomRequest
+	4,  // 8: services.tasks_svc.v1.RoomService.GetRooms:input_type -> services.tasks_svc.v1.GetRoomsRequest
+	6,  // 9: services.tasks_svc.v1.RoomService.UpdateRoom:input_type -> services.tasks_svc.v1.UpdateRoomRequest
+	8,  // 10: services.tasks_svc.v1.RoomService.DeleteRoom:input_type -> services.tasks_svc.v1.DeleteRoomRequest
+	10, // 11: services.tasks_svc.v1.RoomService.GetRoomOverviewsByWard:input_type -> services.tasks_svc.v1.GetRoomOverviewsByWardRequest
+	1,  // 12: services.tasks_svc.v1.RoomService.CreateRoom:output_type -> services.tasks_svc.v1.CreateRoomResponse
+	3,  // 13: services.tasks_svc.v1.RoomService.GetRoom:output_type -> services.tasks_svc.v1.GetRoomResponse
+	5,  // 14: services.tasks_svc.v1.RoomService.GetRooms:output_type -> services.tasks_svc.v1.GetRoomsResponse
+	7,  // 15: services.tasks_svc.v1.RoomService.UpdateRoom:output_type -> services.tasks_svc.v1.UpdateRoomResponse
+	9,  // 16: services.tasks_svc.v1.RoomService.DeleteRoom:output_type -> services.tasks_svc.v1.DeleteRoomResponse
+	11, // 17: services.tasks_svc.v1.RoomService.GetRoomOverviewsByWard:output_type -> services.tasks_svc.v1.GetRoomOverviewsByWardResponse
+	12, // [12:18] is the sub-list for method output_type
+	6,  // [6:12] is the sub-list for method input_type
+	6,  // [6:6] is the sub-list for extension type_name
+	6,  // [6:6] is the sub-list for extension extendee
+	0,  // [0:6] is the sub-list for field type_name
 }
 
 func init() { file_services_tasks_svc_v1_room_svc_proto_init() }
@@ -1529,30 +1284,6 @@ func file_services_tasks_svc_v1_room_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_room_svc_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetRoomsByWardRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_services_tasks_svc_v1_room_svc_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetRoomsByWardResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_services_tasks_svc_v1_room_svc_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateRoomRequest); i {
 			case 0:
 				return &v.state
@@ -1564,7 +1295,7 @@ func file_services_tasks_svc_v1_room_svc_proto_init() {
 				return nil
 			}
 		}
-		file_services_tasks_svc_v1_room_svc_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_services_tasks_svc_v1_room_svc_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateRoomResponse); i {
 			case 0:
 				return &v.state
@@ -1576,7 +1307,7 @@ func file_services_tasks_svc_v1_room_svc_proto_init() {
 				return nil
 			}
 		}
-		file_services_tasks_svc_v1_room_svc_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_services_tasks_svc_v1_room_svc_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DeleteRoomRequest); i {
 			case 0:
 				return &v.state
@@ -1588,7 +1319,7 @@ func file_services_tasks_svc_v1_room_svc_proto_init() {
 				return nil
 			}
 		}
-		file_services_tasks_svc_v1_room_svc_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_services_tasks_svc_v1_room_svc_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DeleteRoomResponse); i {
 			case 0:
 				return &v.state
@@ -1600,7 +1331,7 @@ func file_services_tasks_svc_v1_room_svc_proto_init() {
 				return nil
 			}
 		}
-		file_services_tasks_svc_v1_room_svc_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+		file_services_tasks_svc_v1_room_svc_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetRoomOverviewsByWardRequest); i {
 			case 0:
 				return &v.state
@@ -1612,7 +1343,7 @@ func file_services_tasks_svc_v1_room_svc_proto_init() {
 				return nil
 			}
 		}
-		file_services_tasks_svc_v1_room_svc_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+		file_services_tasks_svc_v1_room_svc_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetRoomOverviewsByWardResponse); i {
 			case 0:
 				return &v.state
@@ -1624,7 +1355,7 @@ func file_services_tasks_svc_v1_room_svc_proto_init() {
 				return nil
 			}
 		}
-		file_services_tasks_svc_v1_room_svc_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+		file_services_tasks_svc_v1_room_svc_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetRoomResponse_Bed); i {
 			case 0:
 				return &v.state
@@ -1636,7 +1367,7 @@ func file_services_tasks_svc_v1_room_svc_proto_init() {
 				return nil
 			}
 		}
-		file_services_tasks_svc_v1_room_svc_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+		file_services_tasks_svc_v1_room_svc_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetRoomsResponse_Room); i {
 			case 0:
 				return &v.state
@@ -1648,7 +1379,7 @@ func file_services_tasks_svc_v1_room_svc_proto_init() {
 				return nil
 			}
 		}
-		file_services_tasks_svc_v1_room_svc_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+		file_services_tasks_svc_v1_room_svc_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetRoomsResponse_Room_Bed); i {
 			case 0:
 				return &v.state
@@ -1660,31 +1391,7 @@ func file_services_tasks_svc_v1_room_svc_proto_init() {
 				return nil
 			}
 		}
-		file_services_tasks_svc_v1_room_svc_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetRoomsByWardResponse_Room); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_services_tasks_svc_v1_room_svc_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetRoomsByWardResponse_Room_Bed); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_services_tasks_svc_v1_room_svc_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+		file_services_tasks_svc_v1_room_svc_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetRoomOverviewsByWardResponse_Room); i {
 			case 0:
 				return &v.state
@@ -1696,7 +1403,7 @@ func file_services_tasks_svc_v1_room_svc_proto_init() {
 				return nil
 			}
 		}
-		file_services_tasks_svc_v1_room_svc_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+		file_services_tasks_svc_v1_room_svc_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetRoomOverviewsByWardResponse_Room_Bed); i {
 			case 0:
 				return &v.state
@@ -1708,7 +1415,7 @@ func file_services_tasks_svc_v1_room_svc_proto_init() {
 				return nil
 			}
 		}
-		file_services_tasks_svc_v1_room_svc_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+		file_services_tasks_svc_v1_room_svc_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetRoomOverviewsByWardResponse_Room_Bed_Patient); i {
 			case 0:
 				return &v.state
@@ -1721,15 +1428,16 @@ func file_services_tasks_svc_v1_room_svc_proto_init() {
 			}
 		}
 	}
-	file_services_tasks_svc_v1_room_svc_proto_msgTypes[8].OneofWrappers = []interface{}{}
-	file_services_tasks_svc_v1_room_svc_proto_msgTypes[20].OneofWrappers = []interface{}{}
+	file_services_tasks_svc_v1_room_svc_proto_msgTypes[4].OneofWrappers = []interface{}{}
+	file_services_tasks_svc_v1_room_svc_proto_msgTypes[6].OneofWrappers = []interface{}{}
+	file_services_tasks_svc_v1_room_svc_proto_msgTypes[16].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_services_tasks_svc_v1_room_svc_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   22,
+			NumMessages:   18,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/gen/go/services/tasks_svc/v1/room_svc_grpc.pb.go b/gen/go/services/tasks_svc/v1/room_svc_grpc.pb.go
index 0d823f8d7..464797996 100644
--- a/gen/go/services/tasks_svc/v1/room_svc_grpc.pb.go
+++ b/gen/go/services/tasks_svc/v1/room_svc_grpc.pb.go
@@ -22,7 +22,6 @@ const (
 	RoomService_CreateRoom_FullMethodName             = "/services.tasks_svc.v1.RoomService/CreateRoom"
 	RoomService_GetRoom_FullMethodName                = "/services.tasks_svc.v1.RoomService/GetRoom"
 	RoomService_GetRooms_FullMethodName               = "/services.tasks_svc.v1.RoomService/GetRooms"
-	RoomService_GetRoomsByWard_FullMethodName         = "/services.tasks_svc.v1.RoomService/GetRoomsByWard"
 	RoomService_UpdateRoom_FullMethodName             = "/services.tasks_svc.v1.RoomService/UpdateRoom"
 	RoomService_DeleteRoom_FullMethodName             = "/services.tasks_svc.v1.RoomService/DeleteRoom"
 	RoomService_GetRoomOverviewsByWard_FullMethodName = "/services.tasks_svc.v1.RoomService/GetRoomOverviewsByWard"
@@ -35,7 +34,6 @@ type RoomServiceClient interface {
 	CreateRoom(ctx context.Context, in *CreateRoomRequest, opts ...grpc.CallOption) (*CreateRoomResponse, error)
 	GetRoom(ctx context.Context, in *GetRoomRequest, opts ...grpc.CallOption) (*GetRoomResponse, error)
 	GetRooms(ctx context.Context, in *GetRoomsRequest, opts ...grpc.CallOption) (*GetRoomsResponse, error)
-	GetRoomsByWard(ctx context.Context, in *GetRoomsByWardRequest, opts ...grpc.CallOption) (*GetRoomsByWardResponse, error)
 	UpdateRoom(ctx context.Context, in *UpdateRoomRequest, opts ...grpc.CallOption) (*UpdateRoomResponse, error)
 	DeleteRoom(ctx context.Context, in *DeleteRoomRequest, opts ...grpc.CallOption) (*DeleteRoomResponse, error)
 	GetRoomOverviewsByWard(ctx context.Context, in *GetRoomOverviewsByWardRequest, opts ...grpc.CallOption) (*GetRoomOverviewsByWardResponse, error)
@@ -79,16 +77,6 @@ func (c *roomServiceClient) GetRooms(ctx context.Context, in *GetRoomsRequest, o
 	return out, nil
 }
 
-func (c *roomServiceClient) GetRoomsByWard(ctx context.Context, in *GetRoomsByWardRequest, opts ...grpc.CallOption) (*GetRoomsByWardResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(GetRoomsByWardResponse)
-	err := c.cc.Invoke(ctx, RoomService_GetRoomsByWard_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *roomServiceClient) UpdateRoom(ctx context.Context, in *UpdateRoomRequest, opts ...grpc.CallOption) (*UpdateRoomResponse, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(UpdateRoomResponse)
@@ -126,7 +114,6 @@ type RoomServiceServer interface {
 	CreateRoom(context.Context, *CreateRoomRequest) (*CreateRoomResponse, error)
 	GetRoom(context.Context, *GetRoomRequest) (*GetRoomResponse, error)
 	GetRooms(context.Context, *GetRoomsRequest) (*GetRoomsResponse, error)
-	GetRoomsByWard(context.Context, *GetRoomsByWardRequest) (*GetRoomsByWardResponse, error)
 	UpdateRoom(context.Context, *UpdateRoomRequest) (*UpdateRoomResponse, error)
 	DeleteRoom(context.Context, *DeleteRoomRequest) (*DeleteRoomResponse, error)
 	GetRoomOverviewsByWard(context.Context, *GetRoomOverviewsByWardRequest) (*GetRoomOverviewsByWardResponse, error)
@@ -146,9 +133,6 @@ func (UnimplementedRoomServiceServer) GetRoom(context.Context, *GetRoomRequest)
 func (UnimplementedRoomServiceServer) GetRooms(context.Context, *GetRoomsRequest) (*GetRoomsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetRooms not implemented")
 }
-func (UnimplementedRoomServiceServer) GetRoomsByWard(context.Context, *GetRoomsByWardRequest) (*GetRoomsByWardResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetRoomsByWard not implemented")
-}
 func (UnimplementedRoomServiceServer) UpdateRoom(context.Context, *UpdateRoomRequest) (*UpdateRoomResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateRoom not implemented")
 }
@@ -225,24 +209,6 @@ func _RoomService_GetRooms_Handler(srv interface{}, ctx context.Context, dec fun
 	return interceptor(ctx, in, info, handler)
 }
 
-func _RoomService_GetRoomsByWard_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetRoomsByWardRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(RoomServiceServer).GetRoomsByWard(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: RoomService_GetRoomsByWard_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(RoomServiceServer).GetRoomsByWard(ctx, req.(*GetRoomsByWardRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _RoomService_UpdateRoom_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(UpdateRoomRequest)
 	if err := dec(in); err != nil {
@@ -316,10 +282,6 @@ var RoomService_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "GetRooms",
 			Handler:    _RoomService_GetRooms_Handler,
 		},
-		{
-			MethodName: "GetRoomsByWard",
-			Handler:    _RoomService_GetRoomsByWard_Handler,
-		},
 		{
 			MethodName: "UpdateRoom",
 			Handler:    _RoomService_UpdateRoom_Handler,
diff --git a/gen/go/services/tasks_svc/v1/task_svc.pb.go b/gen/go/services/tasks_svc/v1/task_svc.pb.go
index 87afc1772..d717a4389 100644
--- a/gen/go/services/tasks_svc/v1/task_svc.pb.go
+++ b/gen/go/services/tasks_svc/v1/task_svc.pb.go
@@ -26,12 +26,14 @@ type CreateTaskRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty" validate:"required"` // @gotags: validate:"required"
-	Description   *string                `protobuf:"bytes,2,opt,name=description,proto3,oneof" json:"description,omitempty"`
-	PatientId     string                 `protobuf:"bytes,3,opt,name=patient_id,json=patientId,proto3" json:"patient_id,omitempty" validate:"uuid4"` // @gotags: validate:"uuid4"
-	Public        *bool                  `protobuf:"varint,4,opt,name=public,proto3,oneof" json:"public,omitempty"`
-	DueAt         *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=due_at,json=dueAt,proto3" json:"due_at,omitempty"`
-	InitialStatus *TaskStatus            `protobuf:"varint,6,opt,name=initial_status,json=initialStatus,proto3,enum=services.tasks_svc.v1.TaskStatus,oneof" json:"initial_status,omitempty"`
+	Name           string                       `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty" validate:"required"` // @gotags: validate:"required"
+	Description    *string                      `protobuf:"bytes,2,opt,name=description,proto3,oneof" json:"description,omitempty"`
+	PatientId      string                       `protobuf:"bytes,3,opt,name=patient_id,json=patientId,proto3" json:"patient_id,omitempty" validate:"uuid4"` // @gotags: validate:"uuid4"
+	Public         *bool                        `protobuf:"varint,4,opt,name=public,proto3,oneof" json:"public,omitempty"`
+	DueAt          *timestamppb.Timestamp       `protobuf:"bytes,5,opt,name=due_at,json=dueAt,proto3" json:"due_at,omitempty"`
+	InitialStatus  *TaskStatus                  `protobuf:"varint,6,opt,name=initial_status,json=initialStatus,proto3,enum=services.tasks_svc.v1.TaskStatus,oneof" json:"initial_status,omitempty"`
+	AssignedUserId *string                      `protobuf:"bytes,7,opt,name=assigned_user_id,json=assignedUserId,proto3,oneof" json:"assigned_user_id,omitempty"`
+	Subtasks       []*CreateTaskRequest_SubTask `protobuf:"bytes,8,rep,name=subtasks,proto3" json:"subtasks,omitempty"`
 }
 
 func (x *CreateTaskRequest) Reset() {
@@ -108,6 +110,20 @@ func (x *CreateTaskRequest) GetInitialStatus() TaskStatus {
 	return TaskStatus_TASK_STATUS_UNSPECIFIED
 }
 
+func (x *CreateTaskRequest) GetAssignedUserId() string {
+	if x != nil && x.AssignedUserId != nil {
+		return *x.AssignedUserId
+	}
+	return ""
+}
+
+func (x *CreateTaskRequest) GetSubtasks() []*CreateTaskRequest_SubTask {
+	if x != nil {
+		return x.Subtasks
+	}
+	return nil
+}
+
 type CreateTaskResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -165,6 +181,7 @@ type UpdateTaskRequest struct {
 	Description *string                `protobuf:"bytes,3,opt,name=description,proto3,oneof" json:"description,omitempty"`
 	DueAt       *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=due_at,json=dueAt,proto3,oneof" json:"due_at,omitempty"`
 	Status      *TaskStatus            `protobuf:"varint,5,opt,name=status,proto3,enum=services.tasks_svc.v1.TaskStatus,oneof" json:"status,omitempty"`
+	Public      *bool                  `protobuf:"varint,6,opt,name=public,proto3,oneof" json:"public,omitempty"`
 }
 
 func (x *UpdateTaskRequest) Reset() {
@@ -234,6 +251,13 @@ func (x *UpdateTaskRequest) GetStatus() TaskStatus {
 	return TaskStatus_TASK_STATUS_UNSPECIFIED
 }
 
+func (x *UpdateTaskRequest) GetPublic() bool {
+	if x != nil && x.Public != nil {
+		return *x.Public
+	}
+	return false
+}
+
 type UpdateTaskResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -328,9 +352,13 @@ type GetTaskResponse struct {
 	Name           string                     `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	Description    string                     `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	AssignedUserId *string                    `protobuf:"bytes,4,opt,name=assigned_user_id,json=assignedUserId,proto3,oneof" json:"assigned_user_id,omitempty"`
-	Subtasks       []*GetTaskResponse_Subtask `protobuf:"bytes,5,rep,name=subtasks,proto3" json:"subtasks,omitempty"`
+	Subtasks       []*GetTaskResponse_SubTask `protobuf:"bytes,5,rep,name=subtasks,proto3" json:"subtasks,omitempty"`
 	Status         TaskStatus                 `protobuf:"varint,6,opt,name=status,proto3,enum=services.tasks_svc.v1.TaskStatus" json:"status,omitempty"`
 	CreatedAt      *timestamppb.Timestamp     `protobuf:"bytes,7,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
+	Public         bool                       `protobuf:"varint,8,opt,name=public,proto3" json:"public,omitempty"`
+	DueAt          *timestamppb.Timestamp     `protobuf:"bytes,9,opt,name=due_at,json=dueAt,proto3" json:"due_at,omitempty"`
+	CreatedBy      string                     `protobuf:"bytes,10,opt,name=created_by,json=createdBy,proto3" json:"created_by,omitempty"`
+	Patient        *GetTaskResponse_Patient   `protobuf:"bytes,11,opt,name=patient,proto3" json:"patient,omitempty"`
 }
 
 func (x *GetTaskResponse) Reset() {
@@ -393,7 +421,7 @@ func (x *GetTaskResponse) GetAssignedUserId() string {
 	return ""
 }
 
-func (x *GetTaskResponse) GetSubtasks() []*GetTaskResponse_Subtask {
+func (x *GetTaskResponse) GetSubtasks() []*GetTaskResponse_SubTask {
 	if x != nil {
 		return x.Subtasks
 	}
@@ -414,6 +442,34 @@ func (x *GetTaskResponse) GetCreatedAt() *timestamppb.Timestamp {
 	return nil
 }
 
+func (x *GetTaskResponse) GetPublic() bool {
+	if x != nil {
+		return x.Public
+	}
+	return false
+}
+
+func (x *GetTaskResponse) GetDueAt() *timestamppb.Timestamp {
+	if x != nil {
+		return x.DueAt
+	}
+	return nil
+}
+
+func (x *GetTaskResponse) GetCreatedBy() string {
+	if x != nil {
+		return x.CreatedBy
+	}
+	return ""
+}
+
+func (x *GetTaskResponse) GetPatient() *GetTaskResponse_Patient {
+	if x != nil {
+		return x.Patient
+	}
+	return nil
+}
+
 type GetTasksByPatientRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1092,7 +1148,7 @@ func (*UpdateSubtaskResponse) Descriptor() ([]byte, []int) {
 	return file_services_tasks_svc_v1_task_svc_proto_rawDescGZIP(), []int{19}
 }
 
-type CompleteSubtaskRequest struct {
+type DeleteSubtaskRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -1101,8 +1157,8 @@ type CompleteSubtaskRequest struct {
 	SubtaskId string `protobuf:"bytes,2,opt,name=subtask_id,json=subtaskId,proto3" json:"subtask_id,omitempty" validate:"uuid4"` // @gotags: validate:"uuid4"
 }
 
-func (x *CompleteSubtaskRequest) Reset() {
-	*x = CompleteSubtaskRequest{}
+func (x *DeleteSubtaskRequest) Reset() {
+	*x = DeleteSubtaskRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1110,13 +1166,13 @@ func (x *CompleteSubtaskRequest) Reset() {
 	}
 }
 
-func (x *CompleteSubtaskRequest) String() string {
+func (x *DeleteSubtaskRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*CompleteSubtaskRequest) ProtoMessage() {}
+func (*DeleteSubtaskRequest) ProtoMessage() {}
 
-func (x *CompleteSubtaskRequest) ProtoReflect() protoreflect.Message {
+func (x *DeleteSubtaskRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1128,33 +1184,33 @@ func (x *CompleteSubtaskRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CompleteSubtaskRequest.ProtoReflect.Descriptor instead.
-func (*CompleteSubtaskRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use DeleteSubtaskRequest.ProtoReflect.Descriptor instead.
+func (*DeleteSubtaskRequest) Descriptor() ([]byte, []int) {
 	return file_services_tasks_svc_v1_task_svc_proto_rawDescGZIP(), []int{20}
 }
 
-func (x *CompleteSubtaskRequest) GetTaskId() string {
+func (x *DeleteSubtaskRequest) GetTaskId() string {
 	if x != nil {
 		return x.TaskId
 	}
 	return ""
 }
 
-func (x *CompleteSubtaskRequest) GetSubtaskId() string {
+func (x *DeleteSubtaskRequest) GetSubtaskId() string {
 	if x != nil {
 		return x.SubtaskId
 	}
 	return ""
 }
 
-type CompleteSubtaskResponse struct {
+type DeleteSubtaskResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 }
 
-func (x *CompleteSubtaskResponse) Reset() {
-	*x = CompleteSubtaskResponse{}
+func (x *DeleteSubtaskResponse) Reset() {
+	*x = DeleteSubtaskResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[21]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1162,13 +1218,13 @@ func (x *CompleteSubtaskResponse) Reset() {
 	}
 }
 
-func (x *CompleteSubtaskResponse) String() string {
+func (x *DeleteSubtaskResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*CompleteSubtaskResponse) ProtoMessage() {}
+func (*DeleteSubtaskResponse) ProtoMessage() {}
 
-func (x *CompleteSubtaskResponse) ProtoReflect() protoreflect.Message {
+func (x *DeleteSubtaskResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[21]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1180,22 +1236,21 @@ func (x *CompleteSubtaskResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CompleteSubtaskResponse.ProtoReflect.Descriptor instead.
-func (*CompleteSubtaskResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use DeleteSubtaskResponse.ProtoReflect.Descriptor instead.
+func (*DeleteSubtaskResponse) Descriptor() ([]byte, []int) {
 	return file_services_tasks_svc_v1_task_svc_proto_rawDescGZIP(), []int{21}
 }
 
-type UncompleteSubtaskRequest struct {
+type RemoveTaskDueDateRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	TaskId    string `protobuf:"bytes,1,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty" validate:"uuid4"`          // @gotags: validate:"uuid4"
-	SubtaskId string `protobuf:"bytes,2,opt,name=subtask_id,json=subtaskId,proto3" json:"subtask_id,omitempty" validate:"uuid4"` // @gotags: validate:"uuid4"
+	TaskId string `protobuf:"bytes,1,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"`
 }
 
-func (x *UncompleteSubtaskRequest) Reset() {
-	*x = UncompleteSubtaskRequest{}
+func (x *RemoveTaskDueDateRequest) Reset() {
+	*x = RemoveTaskDueDateRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[22]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1203,13 +1258,13 @@ func (x *UncompleteSubtaskRequest) Reset() {
 	}
 }
 
-func (x *UncompleteSubtaskRequest) String() string {
+func (x *RemoveTaskDueDateRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*UncompleteSubtaskRequest) ProtoMessage() {}
+func (*RemoveTaskDueDateRequest) ProtoMessage() {}
 
-func (x *UncompleteSubtaskRequest) ProtoReflect() protoreflect.Message {
+func (x *RemoveTaskDueDateRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[22]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1221,33 +1276,26 @@ func (x *UncompleteSubtaskRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use UncompleteSubtaskRequest.ProtoReflect.Descriptor instead.
-func (*UncompleteSubtaskRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use RemoveTaskDueDateRequest.ProtoReflect.Descriptor instead.
+func (*RemoveTaskDueDateRequest) Descriptor() ([]byte, []int) {
 	return file_services_tasks_svc_v1_task_svc_proto_rawDescGZIP(), []int{22}
 }
 
-func (x *UncompleteSubtaskRequest) GetTaskId() string {
+func (x *RemoveTaskDueDateRequest) GetTaskId() string {
 	if x != nil {
 		return x.TaskId
 	}
 	return ""
 }
 
-func (x *UncompleteSubtaskRequest) GetSubtaskId() string {
-	if x != nil {
-		return x.SubtaskId
-	}
-	return ""
-}
-
-type UncompleteSubtaskResponse struct {
+type RemoveTaskDueDateResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 }
 
-func (x *UncompleteSubtaskResponse) Reset() {
-	*x = UncompleteSubtaskResponse{}
+func (x *RemoveTaskDueDateResponse) Reset() {
+	*x = RemoveTaskDueDateResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[23]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1255,13 +1303,13 @@ func (x *UncompleteSubtaskResponse) Reset() {
 	}
 }
 
-func (x *UncompleteSubtaskResponse) String() string {
+func (x *RemoveTaskDueDateResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*UncompleteSubtaskResponse) ProtoMessage() {}
+func (*RemoveTaskDueDateResponse) ProtoMessage() {}
 
-func (x *UncompleteSubtaskResponse) ProtoReflect() protoreflect.Message {
+func (x *RemoveTaskDueDateResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[23]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1273,22 +1321,21 @@ func (x *UncompleteSubtaskResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use UncompleteSubtaskResponse.ProtoReflect.Descriptor instead.
-func (*UncompleteSubtaskResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use RemoveTaskDueDateResponse.ProtoReflect.Descriptor instead.
+func (*RemoveTaskDueDateResponse) Descriptor() ([]byte, []int) {
 	return file_services_tasks_svc_v1_task_svc_proto_rawDescGZIP(), []int{23}
 }
 
-type DeleteSubtaskRequest struct {
+type DeleteTaskRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	TaskId    string `protobuf:"bytes,1,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty" validate:"uuid4"`          // @gotags: validate:"uuid4"
-	SubtaskId string `protobuf:"bytes,2,opt,name=subtask_id,json=subtaskId,proto3" json:"subtask_id,omitempty" validate:"uuid4"` // @gotags: validate:"uuid4"
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 }
 
-func (x *DeleteSubtaskRequest) Reset() {
-	*x = DeleteSubtaskRequest{}
+func (x *DeleteTaskRequest) Reset() {
+	*x = DeleteTaskRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1296,13 +1343,13 @@ func (x *DeleteSubtaskRequest) Reset() {
 	}
 }
 
-func (x *DeleteSubtaskRequest) String() string {
+func (x *DeleteTaskRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*DeleteSubtaskRequest) ProtoMessage() {}
+func (*DeleteTaskRequest) ProtoMessage() {}
 
-func (x *DeleteSubtaskRequest) ProtoReflect() protoreflect.Message {
+func (x *DeleteTaskRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1314,33 +1361,26 @@ func (x *DeleteSubtaskRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use DeleteSubtaskRequest.ProtoReflect.Descriptor instead.
-func (*DeleteSubtaskRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use DeleteTaskRequest.ProtoReflect.Descriptor instead.
+func (*DeleteTaskRequest) Descriptor() ([]byte, []int) {
 	return file_services_tasks_svc_v1_task_svc_proto_rawDescGZIP(), []int{24}
 }
 
-func (x *DeleteSubtaskRequest) GetTaskId() string {
+func (x *DeleteTaskRequest) GetId() string {
 	if x != nil {
-		return x.TaskId
-	}
-	return ""
-}
-
-func (x *DeleteSubtaskRequest) GetSubtaskId() string {
-	if x != nil {
-		return x.SubtaskId
+		return x.Id
 	}
 	return ""
 }
 
-type DeleteSubtaskResponse struct {
+type DeleteTaskResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 }
 
-func (x *DeleteSubtaskResponse) Reset() {
-	*x = DeleteSubtaskResponse{}
+func (x *DeleteTaskResponse) Reset() {
+	*x = DeleteTaskResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[25]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1348,13 +1388,13 @@ func (x *DeleteSubtaskResponse) Reset() {
 	}
 }
 
-func (x *DeleteSubtaskResponse) String() string {
+func (x *DeleteTaskResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*DeleteSubtaskResponse) ProtoMessage() {}
+func (*DeleteTaskResponse) ProtoMessage() {}
 
-func (x *DeleteSubtaskResponse) ProtoReflect() protoreflect.Message {
+func (x *DeleteTaskResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[25]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1366,23 +1406,22 @@ func (x *DeleteSubtaskResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use DeleteSubtaskResponse.ProtoReflect.Descriptor instead.
-func (*DeleteSubtaskResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use DeleteTaskResponse.ProtoReflect.Descriptor instead.
+func (*DeleteTaskResponse) Descriptor() ([]byte, []int) {
 	return file_services_tasks_svc_v1_task_svc_proto_rawDescGZIP(), []int{25}
 }
 
-type GetTaskResponse_Subtask struct {
+type CreateTaskRequest_SubTask struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id   string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	Done bool   `protobuf:"varint,3,opt,name=done,proto3" json:"done,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Done bool   `protobuf:"varint,2,opt,name=done,proto3" json:"done,omitempty"`
 }
 
-func (x *GetTaskResponse_Subtask) Reset() {
-	*x = GetTaskResponse_Subtask{}
+func (x *CreateTaskRequest_SubTask) Reset() {
+	*x = CreateTaskRequest_SubTask{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1390,13 +1429,13 @@ func (x *GetTaskResponse_Subtask) Reset() {
 	}
 }
 
-func (x *GetTaskResponse_Subtask) String() string {
+func (x *CreateTaskRequest_SubTask) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*GetTaskResponse_Subtask) ProtoMessage() {}
+func (*CreateTaskRequest_SubTask) ProtoMessage() {}
 
-func (x *GetTaskResponse_Subtask) ProtoReflect() protoreflect.Message {
+func (x *CreateTaskRequest_SubTask) ProtoReflect() protoreflect.Message {
 	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1408,32 +1447,151 @@ func (x *GetTaskResponse_Subtask) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GetTaskResponse_Subtask.ProtoReflect.Descriptor instead.
-func (*GetTaskResponse_Subtask) Descriptor() ([]byte, []int) {
+// Deprecated: Use CreateTaskRequest_SubTask.ProtoReflect.Descriptor instead.
+func (*CreateTaskRequest_SubTask) Descriptor() ([]byte, []int) {
+	return file_services_tasks_svc_v1_task_svc_proto_rawDescGZIP(), []int{0, 0}
+}
+
+func (x *CreateTaskRequest_SubTask) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *CreateTaskRequest_SubTask) GetDone() bool {
+	if x != nil {
+		return x.Done
+	}
+	return false
+}
+
+type GetTaskResponse_Patient struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id                      string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	HumanReadableIdentifier string `protobuf:"bytes,2,opt,name=human_readable_identifier,json=humanReadableIdentifier,proto3" json:"human_readable_identifier,omitempty"`
+}
+
+func (x *GetTaskResponse_Patient) Reset() {
+	*x = GetTaskResponse_Patient{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[27]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GetTaskResponse_Patient) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GetTaskResponse_Patient) ProtoMessage() {}
+
+func (x *GetTaskResponse_Patient) ProtoReflect() protoreflect.Message {
+	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[27]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GetTaskResponse_Patient.ProtoReflect.Descriptor instead.
+func (*GetTaskResponse_Patient) Descriptor() ([]byte, []int) {
 	return file_services_tasks_svc_v1_task_svc_proto_rawDescGZIP(), []int{5, 0}
 }
 
-func (x *GetTaskResponse_Subtask) GetId() string {
+func (x *GetTaskResponse_Patient) GetId() string {
 	if x != nil {
 		return x.Id
 	}
 	return ""
 }
 
-func (x *GetTaskResponse_Subtask) GetName() string {
+func (x *GetTaskResponse_Patient) GetHumanReadableIdentifier() string {
+	if x != nil {
+		return x.HumanReadableIdentifier
+	}
+	return ""
+}
+
+type GetTaskResponse_SubTask struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id        string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	Name      string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	Done      bool   `protobuf:"varint,3,opt,name=done,proto3" json:"done,omitempty"`
+	CreatedBy string `protobuf:"bytes,4,opt,name=created_by,json=createdBy,proto3" json:"created_by,omitempty"`
+}
+
+func (x *GetTaskResponse_SubTask) Reset() {
+	*x = GetTaskResponse_SubTask{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[28]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GetTaskResponse_SubTask) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GetTaskResponse_SubTask) ProtoMessage() {}
+
+func (x *GetTaskResponse_SubTask) ProtoReflect() protoreflect.Message {
+	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[28]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GetTaskResponse_SubTask.ProtoReflect.Descriptor instead.
+func (*GetTaskResponse_SubTask) Descriptor() ([]byte, []int) {
+	return file_services_tasks_svc_v1_task_svc_proto_rawDescGZIP(), []int{5, 1}
+}
+
+func (x *GetTaskResponse_SubTask) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *GetTaskResponse_SubTask) GetName() string {
 	if x != nil {
 		return x.Name
 	}
 	return ""
 }
 
-func (x *GetTaskResponse_Subtask) GetDone() bool {
+func (x *GetTaskResponse_SubTask) GetDone() bool {
 	if x != nil {
 		return x.Done
 	}
 	return false
 }
 
+func (x *GetTaskResponse_SubTask) GetCreatedBy() string {
+	if x != nil {
+		return x.CreatedBy
+	}
+	return ""
+}
+
 type GetTasksByPatientResponse_Task struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1455,7 +1613,7 @@ type GetTasksByPatientResponse_Task struct {
 func (x *GetTasksByPatientResponse_Task) Reset() {
 	*x = GetTasksByPatientResponse_Task{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[27]
+		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[29]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1468,7 +1626,7 @@ func (x *GetTasksByPatientResponse_Task) String() string {
 func (*GetTasksByPatientResponse_Task) ProtoMessage() {}
 
 func (x *GetTasksByPatientResponse_Task) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[27]
+	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[29]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1575,7 +1733,7 @@ type GetTasksByPatientResponse_Task_SubTask struct {
 func (x *GetTasksByPatientResponse_Task_SubTask) Reset() {
 	*x = GetTasksByPatientResponse_Task_SubTask{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[28]
+		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[30]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1588,7 +1746,7 @@ func (x *GetTasksByPatientResponse_Task_SubTask) String() string {
 func (*GetTasksByPatientResponse_Task_SubTask) ProtoMessage() {}
 
 func (x *GetTasksByPatientResponse_Task_SubTask) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[28]
+	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[30]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1652,7 +1810,7 @@ type GetTasksByPatientSortedByStatusResponse_Task struct {
 func (x *GetTasksByPatientSortedByStatusResponse_Task) Reset() {
 	*x = GetTasksByPatientSortedByStatusResponse_Task{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[29]
+		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[31]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1665,7 +1823,7 @@ func (x *GetTasksByPatientSortedByStatusResponse_Task) String() string {
 func (*GetTasksByPatientSortedByStatusResponse_Task) ProtoMessage() {}
 
 func (x *GetTasksByPatientSortedByStatusResponse_Task) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[29]
+	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[31]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1765,7 +1923,7 @@ type GetTasksByPatientSortedByStatusResponse_Task_SubTask struct {
 func (x *GetTasksByPatientSortedByStatusResponse_Task_SubTask) Reset() {
 	*x = GetTasksByPatientSortedByStatusResponse_Task_SubTask{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[30]
+		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[32]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1778,7 +1936,7 @@ func (x *GetTasksByPatientSortedByStatusResponse_Task_SubTask) String() string {
 func (*GetTasksByPatientSortedByStatusResponse_Task_SubTask) ProtoMessage() {}
 
 func (x *GetTasksByPatientSortedByStatusResponse_Task_SubTask) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[30]
+	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[32]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1843,7 +2001,7 @@ type GetAssignedTasksResponse_Task struct {
 func (x *GetAssignedTasksResponse_Task) Reset() {
 	*x = GetAssignedTasksResponse_Task{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[31]
+		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[33]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1856,7 +2014,7 @@ func (x *GetAssignedTasksResponse_Task) String() string {
 func (*GetAssignedTasksResponse_Task) ProtoMessage() {}
 
 func (x *GetAssignedTasksResponse_Task) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[31]
+	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[33]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1954,14 +2112,14 @@ type GetAssignedTasksResponse_Task_Patient struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id   string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	Id                      string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	HumanReadableIdentifier string `protobuf:"bytes,2,opt,name=human_readable_identifier,json=humanReadableIdentifier,proto3" json:"human_readable_identifier,omitempty"`
 }
 
 func (x *GetAssignedTasksResponse_Task_Patient) Reset() {
 	*x = GetAssignedTasksResponse_Task_Patient{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[32]
+		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[34]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1974,7 +2132,7 @@ func (x *GetAssignedTasksResponse_Task_Patient) String() string {
 func (*GetAssignedTasksResponse_Task_Patient) ProtoMessage() {}
 
 func (x *GetAssignedTasksResponse_Task_Patient) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[32]
+	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[34]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1997,9 +2155,9 @@ func (x *GetAssignedTasksResponse_Task_Patient) GetId() string {
 	return ""
 }
 
-func (x *GetAssignedTasksResponse_Task_Patient) GetName() string {
+func (x *GetAssignedTasksResponse_Task_Patient) GetHumanReadableIdentifier() string {
 	if x != nil {
-		return x.Name
+		return x.HumanReadableIdentifier
 	}
 	return ""
 }
@@ -2018,7 +2176,7 @@ type GetAssignedTasksResponse_Task_SubTask struct {
 func (x *GetAssignedTasksResponse_Task_SubTask) Reset() {
 	*x = GetAssignedTasksResponse_Task_SubTask{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[33]
+		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[35]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2031,7 +2189,7 @@ func (x *GetAssignedTasksResponse_Task_SubTask) String() string {
 func (*GetAssignedTasksResponse_Task_SubTask) ProtoMessage() {}
 
 func (x *GetAssignedTasksResponse_Task_SubTask) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[33]
+	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[35]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2081,12 +2239,13 @@ type CreateSubtaskRequest_Subtask struct {
 	unknownFields protoimpl.UnknownFields
 
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Done bool   `protobuf:"varint,2,opt,name=done,proto3" json:"done,omitempty"`
 }
 
 func (x *CreateSubtaskRequest_Subtask) Reset() {
 	*x = CreateSubtaskRequest_Subtask{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[34]
+		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[36]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2099,7 +2258,7 @@ func (x *CreateSubtaskRequest_Subtask) String() string {
 func (*CreateSubtaskRequest_Subtask) ProtoMessage() {}
 
 func (x *CreateSubtaskRequest_Subtask) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[34]
+	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[36]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2122,18 +2281,26 @@ func (x *CreateSubtaskRequest_Subtask) GetName() string {
 	return ""
 }
 
+func (x *CreateSubtaskRequest_Subtask) GetDone() bool {
+	if x != nil {
+		return x.Done
+	}
+	return false
+}
+
 type UpdateSubtaskRequest_Subtask struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
 	Name *string `protobuf:"bytes,1,opt,name=name,proto3,oneof" json:"name,omitempty"`
+	Done *bool   `protobuf:"varint,2,opt,name=done,proto3,oneof" json:"done,omitempty"`
 }
 
 func (x *UpdateSubtaskRequest_Subtask) Reset() {
 	*x = UpdateSubtaskRequest_Subtask{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[35]
+		mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[37]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2146,7 +2313,7 @@ func (x *UpdateSubtaskRequest_Subtask) String() string {
 func (*UpdateSubtaskRequest_Subtask) ProtoMessage() {}
 
 func (x *UpdateSubtaskRequest_Subtask) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[35]
+	mi := &file_services_tasks_svc_v1_task_svc_proto_msgTypes[37]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2169,6 +2336,13 @@ func (x *UpdateSubtaskRequest_Subtask) GetName() string {
 	return ""
 }
 
+func (x *UpdateSubtaskRequest_Subtask) GetDone() bool {
+	if x != nil && x.Done != nil {
+		return *x.Done
+	}
+	return false
+}
+
 var File_services_tasks_svc_v1_task_svc_proto protoreflect.FileDescriptor
 
 var file_services_tasks_svc_v1_task_svc_proto_rawDesc = []byte{
@@ -2180,7 +2354,7 @@ var file_services_tasks_svc_v1_task_svc_proto_rawDesc = []byte{
 	0x63, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
 	0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x22, 0xba, 0x02, 0x0a, 0x11, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b,
+	0x6f, 0x22, 0xff, 0x03, 0x0a, 0x11, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b,
 	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0b, 0x64,
 	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
@@ -2197,380 +2371,413 @@ var file_services_tasks_svc_v1_task_svc_proto_rawDesc = []byte{
 	0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76,
 	0x31, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x48, 0x02, 0x52, 0x0d,
 	0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x88, 0x01, 0x01,
+	0x12, 0x2d, 0x0a, 0x10, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x75, 0x73, 0x65,
+	0x72, 0x5f, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x03, 0x52, 0x0e, 0x61, 0x73,
+	0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12,
+	0x4c, 0x0a, 0x08, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x30, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73,
+	0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x53, 0x75, 0x62, 0x54,
+	0x61, 0x73, 0x6b, 0x52, 0x08, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x1a, 0x31, 0x0a,
+	0x07, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04,
+	0x64, 0x6f, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x64, 0x6f, 0x6e, 0x65,
 	0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e,
 	0x42, 0x09, 0x0a, 0x07, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x42, 0x11, 0x0a, 0x0f, 0x5f,
-	0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x24,
-	0x0a, 0x12, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x02, 0x69, 0x64, 0x22, 0x8a, 0x02, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54,
-	0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63,
-	0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x36, 0x0a, 0x06, 0x64, 0x75,
-	0x65, 0x5f, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f,
+	0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x13,
+	0x0a, 0x11, 0x5f, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72,
+	0x5f, 0x69, 0x64, 0x22, 0x24, 0x0a, 0x12, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73,
+	0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0xb2, 0x02, 0x0a, 0x11, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12,
+	0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52,
+	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52,
+	0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12,
+	0x36, 0x0a, 0x06, 0x64, 0x75, 0x65, 0x5f, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x48, 0x02, 0x52, 0x05, 0x64,
+	0x75, 0x65, 0x41, 0x74, 0x88, 0x01, 0x01, 0x12, 0x3e, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e,
+	0x54, 0x61, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x48, 0x03, 0x52, 0x06, 0x73, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x70, 0x75, 0x62, 0x6c, 0x69,
+	0x63, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x48, 0x04, 0x52, 0x06, 0x70, 0x75, 0x62, 0x6c, 0x69,
+	0x63, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x0e, 0x0a,
+	0x0c, 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x09, 0x0a,
+	0x07, 0x5f, 0x64, 0x75, 0x65, 0x5f, 0x61, 0x74, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x73, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x22, 0x14,
+	0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x20, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0xca, 0x05, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x54, 0x61,
+	0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20,
+	0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x2d, 0x0a, 0x10, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x75, 0x73, 0x65,
+	0x72, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0e, 0x61, 0x73,
+	0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12,
+	0x4a, 0x0a, 0x08, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x2e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73,
+	0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73,
+	0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73,
+	0x6b, 0x52, 0x08, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x39, 0x0a, 0x06, 0x73,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
+	0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06,
+	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x39, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x64, 0x5f, 0x61, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f,
 	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d,
-	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x48, 0x02, 0x52, 0x05, 0x64, 0x75, 0x65, 0x41, 0x74, 0x88,
-	0x01, 0x01, 0x12, 0x3e, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x21, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61,
-	0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x53,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x48, 0x03, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x88,
-	0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x0e, 0x0a, 0x0c, 0x5f,
-	0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x09, 0x0a, 0x07, 0x5f,
-	0x64, 0x75, 0x65, 0x5f, 0x61, 0x74, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x22, 0x14, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x20, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x54, 0x61,
-	0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0xa0, 0x03, 0x0a, 0x0f, 0x47, 0x65,
-	0x74, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a,
-	0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x10, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f,
-	0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52,
+	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41,
+	0x74, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x18, 0x08, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x06, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x12, 0x31, 0x0a, 0x06, 0x64, 0x75, 0x65,
+	0x5f, 0x61, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65,
+	0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x05, 0x64, 0x75, 0x65, 0x41, 0x74, 0x12, 0x1d, 0x0a, 0x0a,
+	0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x12, 0x48, 0x0a, 0x07, 0x70,
+	0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76,
+	0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x07, 0x70, 0x61,
+	0x74, 0x69, 0x65, 0x6e, 0x74, 0x1a, 0x55, 0x0a, 0x07, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74,
+	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
+	0x12, 0x3a, 0x0a, 0x19, 0x68, 0x75, 0x6d, 0x61, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x61, 0x62,
+	0x6c, 0x65, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x17, 0x68, 0x75, 0x6d, 0x61, 0x6e, 0x52, 0x65, 0x61, 0x64, 0x61, 0x62,
+	0x6c, 0x65, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x1a, 0x60, 0x0a, 0x07,
+	0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64,
+	0x6f, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x64, 0x6f, 0x6e, 0x65, 0x12,
+	0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x42, 0x13,
+	0x0a, 0x11, 0x5f, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72,
+	0x5f, 0x69, 0x64, 0x22, 0x39, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42,
+	0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x1d, 0x0a, 0x0a, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x22, 0xb7,
+	0x05, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74,
+	0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4b, 0x0a, 0x05,
+	0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
+	0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61,
+	0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61,
+	0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x1a, 0xcc, 0x04, 0x0a, 0x04, 0x54, 0x61,
+	0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
+	0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x39, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74,
+	0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31,
+	0x2e, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x12, 0x2d, 0x0a, 0x10, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f,
+	0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52,
 	0x0e, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x88,
-	0x01, 0x01, 0x12, 0x4a, 0x0a, 0x08, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x05,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e,
-	0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
-	0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, 0x75, 0x62,
-	0x74, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x39,
-	0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21,
+	0x01, 0x01, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x49,
+	0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x06, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x12, 0x31, 0x0a, 0x06, 0x64, 0x75, 0x65,
+	0x5f, 0x61, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65,
+	0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x05, 0x64, 0x75, 0x65, 0x41, 0x74, 0x12, 0x1d, 0x0a, 0x0a,
+	0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x12, 0x59, 0x0a, 0x08, 0x73,
+	0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3d, 0x2e,
+	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73,
+	0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79,
+	0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e,
+	0x54, 0x61, 0x73, 0x6b, 0x2e, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x73, 0x75,
+	0x62, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x39, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x64, 0x5f, 0x61, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d,
+	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41,
+	0x74, 0x1a, 0x60, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x12, 0x12, 0x0a, 0x04, 0x64, 0x6f, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04,
+	0x64, 0x6f, 0x6e, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f,
+	0x62, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x64, 0x42, 0x79, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64,
+	0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x22, 0x47, 0x0a, 0x26, 0x47, 0x65, 0x74, 0x54,
+	0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x6f, 0x72,
+	0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x49,
+	0x64, 0x22, 0xe3, 0x06, 0x0a, 0x27, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79,
+	0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x57, 0x0a,
+	0x04, 0x74, 0x6f, 0x64, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
+	0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61,
+	0x74, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b,
+	0x52, 0x04, 0x74, 0x6f, 0x64, 0x6f, 0x12, 0x64, 0x0a, 0x0b, 0x69, 0x6e, 0x5f, 0x70, 0x72, 0x6f,
+	0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
+	0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61,
+	0x74, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b,
+	0x52, 0x0a, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x57, 0x0a, 0x04,
+	0x64, 0x6f, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x73, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e,
+	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74,
+	0x69, 0x65, 0x6e, 0x74, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74,
+	0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52,
+	0x04, 0x64, 0x6f, 0x6e, 0x65, 0x1a, 0x9f, 0x04, 0x0a, 0x04, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e,
+	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12,
+	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x10, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64,
+	0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00,
+	0x52, 0x0e, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64,
+	0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x69,
+	0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74,
+	0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x06, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x12, 0x31, 0x0a, 0x06, 0x64, 0x75,
+	0x65, 0x5f, 0x61, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d,
+	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x05, 0x64, 0x75, 0x65, 0x41, 0x74, 0x12, 0x1d, 0x0a,
+	0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x12, 0x67, 0x0a, 0x08,
+	0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x4b,
 	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f,
-	0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x39, 0x0a, 0x0a, 0x63, 0x72, 0x65,
-	0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74,
-	0x65, 0x64, 0x41, 0x74, 0x1a, 0x41, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x12,
-	0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12,
-	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x6f, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x04, 0x64, 0x6f, 0x6e, 0x65, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x61, 0x73, 0x73, 0x69,
-	0x67, 0x6e, 0x65, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x22, 0x39, 0x0a, 0x18,
-	0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e,
-	0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61, 0x74, 0x69,
-	0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61,
-	0x74, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x22, 0xb7, 0x05, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x54,
-	0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4b, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e,
-	0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
-	0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73,
-	0x6b, 0x73, 0x1a, 0xcc, 0x04, 0x0a, 0x04, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42,
+	0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x42, 0x79,
+	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54,
+	0x61, 0x73, 0x6b, 0x2e, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x73, 0x75, 0x62,
+	0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x39, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64,
+	0x5f, 0x61, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65,
+	0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74,
+	0x1a, 0x60, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69,
 	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e,
 	0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
-	0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x12, 0x39, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x0e, 0x32, 0x21, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73,
-	0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x2d, 0x0a, 0x10,
-	0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0e, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e,
-	0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, 0x0a, 0x70,
-	0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x75,
-	0x62, 0x6c, 0x69, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x70, 0x75, 0x62, 0x6c,
-	0x69, 0x63, 0x12, 0x31, 0x0a, 0x06, 0x64, 0x75, 0x65, 0x5f, 0x61, 0x74, 0x18, 0x08, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x05,
-	0x64, 0x75, 0x65, 0x41, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x5f, 0x62, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74,
-	0x65, 0x64, 0x42, 0x79, 0x12, 0x59, 0x0a, 0x08, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x73,
-	0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47,
-	0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x53, 0x75,
-	0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12,
-	0x39, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x0b, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52,
-	0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x1a, 0x60, 0x0a, 0x07, 0x53, 0x75,
-	0x62, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x6f, 0x6e,
-	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x64, 0x6f, 0x6e, 0x65, 0x12, 0x1d, 0x0a,
-	0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x42, 0x13, 0x0a, 0x11,
-	0x5f, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69,
-	0x64, 0x22, 0x47, 0x0a, 0x26, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50,
-	0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x70,
-	0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x22, 0xe3, 0x06, 0x0a, 0x27, 0x47,
-	0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74,
-	0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x57, 0x0a, 0x04, 0x74, 0x6f, 0x64, 0x6f, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e,
-	0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
-	0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x6f,
-	0x72, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x6f, 0x64, 0x6f, 0x12,
-	0x64, 0x0a, 0x0b, 0x69, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e,
-	0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
-	0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x6f,
-	0x72, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x0a, 0x69, 0x6e, 0x50, 0x72, 0x6f,
-	0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x57, 0x0a, 0x04, 0x64, 0x6f, 0x6e, 0x65, 0x18, 0x03, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74,
-	0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54,
-	0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x6f, 0x72,
-	0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x64, 0x6f, 0x6e, 0x65, 0x1a, 0x9f,
-	0x04, 0x0a, 0x04, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a,
-	0x10, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69,
-	0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0e, 0x61, 0x73, 0x73, 0x69, 0x67,
-	0x6e, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, 0x0a,
-	0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70,
-	0x75, 0x62, 0x6c, 0x69, 0x63, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x70, 0x75, 0x62,
-	0x6c, 0x69, 0x63, 0x12, 0x31, 0x0a, 0x06, 0x64, 0x75, 0x65, 0x5f, 0x61, 0x74, 0x18, 0x07, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52,
-	0x05, 0x64, 0x75, 0x65, 0x41, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65,
-	0x64, 0x5f, 0x62, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61,
-	0x74, 0x65, 0x64, 0x42, 0x79, 0x12, 0x67, 0x0a, 0x08, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b,
-	0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x4b, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e,
-	0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e,
-	0x74, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x53, 0x75, 0x62,
-	0x54, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x39,
-	0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x0a, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09,
-	0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x1a, 0x60, 0x0a, 0x07, 0x53, 0x75, 0x62,
+	0x12, 0x0a, 0x04, 0x64, 0x6f, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x64,
+	0x6f, 0x6e, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62,
+	0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64,
+	0x42, 0x79, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f,
+	0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x41, 0x73,
+	0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x22, 0xaa, 0x06, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e,
+	0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x4a, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34,
+	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f,
+	0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e,
+	0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e,
+	0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x1a, 0xc1, 0x05, 0x0a, 0x04,
 	0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
 	0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x6f, 0x6e, 0x65,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x64, 0x6f, 0x6e, 0x65, 0x12, 0x1d, 0x0a, 0x0a,
-	0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x42, 0x13, 0x0a, 0x11, 0x5f,
-	0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64,
-	0x22, 0x19, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x54,
-	0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x82, 0x06, 0x0a, 0x18,
-	0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x73,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4a, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e,
-	0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x73,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74,
-	0x61, 0x73, 0x6b, 0x73, 0x1a, 0x99, 0x05, 0x0a, 0x04, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a,
-	0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x39, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74,
-	0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x73, 0x6b,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x28,
-	0x0a, 0x10, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f,
-	0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e,
-	0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x56, 0x0a, 0x07, 0x70, 0x61, 0x74, 0x69,
-	0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76,
-	0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x54, 0x61, 0x73,
-	0x6b, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x2e,
-	0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x07, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74,
-	0x12, 0x16, 0x0a, 0x06, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x06, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x12, 0x31, 0x0a, 0x06, 0x64, 0x75, 0x65, 0x5f,
-	0x61, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73,
-	0x74, 0x61, 0x6d, 0x70, 0x52, 0x05, 0x64, 0x75, 0x65, 0x41, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x63,
-	0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x12, 0x58, 0x0a, 0x08, 0x73, 0x75,
-	0x62, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76,
-	0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64,
-	0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61,
-	0x73, 0x6b, 0x2e, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x73, 0x75, 0x62, 0x74,
-	0x61, 0x73, 0x6b, 0x73, 0x12, 0x39, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f,
-	0x61, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73,
-	0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x1a,
-	0x2d, 0x0a, 0x07, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x1a, 0x60,
-	0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a,
-	0x04, 0x64, 0x6f, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x64, 0x6f, 0x6e,
-	0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79,
-	0x22, 0x45, 0x0a, 0x11, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x17,
-	0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x41, 0x73, 0x73, 0x69, 0x67,
-	0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x47, 0x0a,
-	0x13, 0x55, 0x6e, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71,
+	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64,
+	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x39, 0x0a, 0x06, 0x73, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x73, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e,
+	0x76, 0x31, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65,
+	0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0e, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12,
+	0x56, 0x0a, 0x07, 0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x3c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b,
+	0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x69,
+	0x67, 0x6e, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x07,
+	0x70, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x75, 0x62, 0x6c, 0x69,
+	0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x12,
+	0x31, 0x0a, 0x06, 0x64, 0x75, 0x65, 0x5f, 0x61, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x05, 0x64, 0x75, 0x65,
+	0x41, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79,
+	0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42,
+	0x79, 0x12, 0x58, 0x0a, 0x08, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x0a, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74,
+	0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41,
+	0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73,
+	0x6b, 0x52, 0x08, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x39, 0x0a, 0x0a, 0x63,
+	0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x63, 0x72, 0x65,
+	0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x1a, 0x55, 0x0a, 0x07, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e,
+	0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
+	0x64, 0x12, 0x3a, 0x0a, 0x19, 0x68, 0x75, 0x6d, 0x61, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x61,
+	0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x17, 0x68, 0x75, 0x6d, 0x61, 0x6e, 0x52, 0x65, 0x61, 0x64, 0x61,
+	0x62, 0x6c, 0x65, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x1a, 0x60, 0x0a,
+	0x07, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04,
+	0x64, 0x6f, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x64, 0x6f, 0x6e, 0x65,
+	0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x22,
+	0x45, 0x0a, 0x11, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71,
 	0x75, 0x65, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x17, 0x0a,
 	0x07, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x16, 0x0a, 0x14, 0x55, 0x6e, 0x61, 0x73, 0x73, 0x69,
-	0x67, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x9d,
-	0x01, 0x0a, 0x14, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x5f,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64,
-	0x12, 0x4d, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x33, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73,
-	0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
-	0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x53,
-	0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x07, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x1a,
-	0x1d, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x36,
-	0x0a, 0x15, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x75, 0x62, 0x74, 0x61,
-	0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x75, 0x62,
-	0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0xca, 0x01, 0x0a, 0x14, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x17, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x75, 0x62, 0x74,
-	0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x75,
-	0x62, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x4d, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x74, 0x61,
-	0x73, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31,
-	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x07, 0x73,
-	0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x1a, 0x2b, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73,
-	0x6b, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48,
-	0x00, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6e,
-	0x61, 0x6d, 0x65, 0x22, 0x17, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62,
-	0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x50, 0x0a, 0x16,
-	0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52,
+	0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e,
+	0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x47, 0x0a, 0x13,
+	0x55, 0x6e, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07,
+	0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75,
+	0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x16, 0x0a, 0x14, 0x55, 0x6e, 0x61, 0x73, 0x73, 0x69, 0x67,
+	0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xb1, 0x01,
+	0x0a, 0x14, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52,
 	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69,
 	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12,
-	0x1d, 0x0a, 0x0a, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x19,
-	0x0a, 0x17, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73,
-	0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x52, 0x0a, 0x18, 0x55, 0x6e, 0x63,
-	0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1d,
-	0x0a, 0x0a, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x09, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x1b, 0x0a,
-	0x19, 0x55, 0x6e, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61,
-	0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x4e, 0x0a, 0x14, 0x44, 0x65,
-	0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x4d, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x33, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b,
+	0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53,
+	0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x53, 0x75,
+	0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x07, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x1a, 0x31,
+	0x0a, 0x07, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a,
+	0x04, 0x64, 0x6f, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x64, 0x6f, 0x6e,
+	0x65, 0x22, 0x36, 0x0a, 0x15, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61,
+	0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x75,
+	0x62, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0xec, 0x01, 0x0a, 0x14, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65,
 	0x73, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x73,
 	0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x17, 0x0a, 0x15, 0x44, 0x65,
-	0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x32, 0xd1, 0x0b, 0x0a, 0x0b, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x12, 0x63, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73,
+	0x09, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x4d, 0x0a, 0x07, 0x73, 0x75,
+	0x62, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
+	0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73,
+	0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b,
+	0x52, 0x07, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x1a, 0x4d, 0x0a, 0x07, 0x53, 0x75, 0x62,
+	0x74, 0x61, 0x73, 0x6b, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a,
+	0x04, 0x64, 0x6f, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x48, 0x01, 0x52, 0x04, 0x64,
+	0x6f, 0x6e, 0x65, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42,
+	0x07, 0x0a, 0x05, 0x5f, 0x64, 0x6f, 0x6e, 0x65, 0x22, 0x17, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x4e, 0x0a, 0x14, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61,
+	0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x61, 0x73,
+	0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b,
+	0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x49,
+	0x64, 0x22, 0x17, 0x0a, 0x15, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61,
+	0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x33, 0x0a, 0x18, 0x52, 0x65,
+	0x6d, 0x6f, 0x76, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x75, 0x65, 0x44, 0x61, 0x74, 0x65, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22,
+	0x1b, 0x0a, 0x19, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x75, 0x65,
+	0x44, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x23, 0x0a, 0x11,
+	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
+	0x64, 0x22, 0x14, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xc2, 0x0b, 0x0a, 0x0b, 0x54, 0x61, 0x73, 0x6b,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x63, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74,
+	0x65, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x28, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
+	0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x29, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73,
+	0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61,
+	0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x0a,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x28, 0x2e, 0x73, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e,
+	0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e,
+	0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x00, 0x12, 0x5a, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x25, 0x2e, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76,
+	0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74,
+	0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54,
+	0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a,
+	0x11, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65,
+	0x6e, 0x74, 0x12, 0x2f, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61,
+	0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61,
+	0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74,
+	0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54,
+	0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0xa2, 0x01, 0x0a, 0x1f, 0x47, 0x65, 0x74, 0x54,
+	0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x6f, 0x72,
+	0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x3d, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
+	0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61,
+	0x74, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3e, 0x2e, 0x73, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e,
+	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74,
+	0x69, 0x65, 0x6e, 0x74, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74,
+	0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x75, 0x0a, 0x10,
+	0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x73,
+	0x12, 0x2e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b,
+	0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x69,
+	0x67, 0x6e, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x2f, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b,
+	0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x69,
+	0x67, 0x6e, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x0a, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x61, 0x73,
 	0x6b, 0x12, 0x28, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73,
-	0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e,
 	0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x73, 0x65,
 	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
-	0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x28, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x29, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b,
-	0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54,
-	0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x5a, 0x0a,
-	0x07, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x25, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x2e, 0x76, 0x31, 0x2e, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x69, 0x0a, 0x0c, 0x55, 0x6e, 0x61, 0x73,
+	0x73, 0x69, 0x67, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x2a, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
 	0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31,
-	0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x26, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73,
-	0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x11, 0x47, 0x65, 0x74,
-	0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x2f,
-	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f,
-	0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42,
-	0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x30, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73,
-	0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73,
-	0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x12, 0xa2, 0x01, 0x0a, 0x1f, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73,
-	0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x42,
-	0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x3d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e,
-	0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e,
-	0x74, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47,
-	0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x79, 0x50, 0x61, 0x74, 0x69, 0x65, 0x6e, 0x74,
-	0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x75, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x41,
-	0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x2e, 0x2e, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76,
-	0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64,
-	0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76,
-	0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64,
-	0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
-	0x63, 0x0a, 0x0a, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x28, 0x2e,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73,
-	0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x61, 0x73, 0x6b,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e,
-	0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x00, 0x12, 0x69, 0x0a, 0x0c, 0x55, 0x6e, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e,
-	0x54, 0x61, 0x73, 0x6b, 0x12, 0x2a, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e,
+	0x2e, 0x55, 0x6e, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e,
 	0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x61,
-	0x73, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x2b, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b,
-	0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x61, 0x73, 0x73, 0x69, 0x67,
-	0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
-	0x6c, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b,
+	0x73, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x00, 0x12, 0x6c, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62,
+	0x74, 0x61, 0x73, 0x6b, 0x12, 0x2b, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e,
+	0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65,
+	0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x2c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73,
+	0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x00, 0x12, 0x6c, 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61,
+	0x73, 0x6b, 0x12, 0x2b, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61,
+	0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x2c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73,
+	0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x75,
+	0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
+	0x6c, 0x0a, 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b,
 	0x12, 0x2b, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b,
-	0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53,
+	0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53,
 	0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e,
 	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73,
-	0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74,
-	0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6c, 0x0a,
-	0x0d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x2b,
-	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f,
-	0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62,
-	0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x73, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
-	0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73,
-	0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x72, 0x0a, 0x0f, 0x43,
-	0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x2d,
-	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f,
-	0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x53,
-	0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73,
-	0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75,
-	0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
-	0x78, 0x0a, 0x11, 0x55, 0x6e, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62,
-	0x74, 0x61, 0x73, 0x6b, 0x12, 0x2f, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e,
-	0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x63,
-	0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
-	0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e,
-	0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6c, 0x0a, 0x0d, 0x44, 0x65, 0x6c,
-	0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x2b, 0x2e, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e,
-	0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e,
-	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0xb9, 0x01, 0x0a, 0x19, 0x63, 0x6f, 0x6d, 0x2e,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73,
-	0x76, 0x63, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x76, 0x63, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x1c, 0x67, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2d,
-	0x73, 0x76, 0x63, 0xa2, 0x02, 0x03, 0x53, 0x54, 0x58, 0xaa, 0x02, 0x14, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x73, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76, 0x63, 0x2e, 0x56, 0x31,
-	0xca, 0x02, 0x14, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x5c, 0x54, 0x61, 0x73, 0x6b,
-	0x73, 0x53, 0x76, 0x63, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x73, 0x5c, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76, 0x63, 0x5c, 0x56, 0x31, 0x5c, 0x47,
-	0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x16, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x73, 0x3a, 0x3a, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76, 0x63, 0x3a,
-	0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x74,
+	0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a,
+	0x11, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x75, 0x65, 0x44, 0x61,
+	0x74, 0x65, 0x12, 0x2f, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61,
+	0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x76,
+	0x65, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x75, 0x65, 0x44, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74,
+	0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x6d, 0x6f,
+	0x76, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x75, 0x65, 0x44, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74,
+	0x65, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x28, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
+	0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65,
+	0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x29, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73,
+	0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61,
+	0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0xb9, 0x01, 0x0a,
+	0x19, 0x63, 0x6f, 0x6d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61,
+	0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x54, 0x61, 0x73, 0x6b,
+	0x53, 0x76, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x1c, 0x67, 0x65, 0x6e, 0x2f,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x74,
+	0x61, 0x73, 0x6b, 0x73, 0x2d, 0x73, 0x76, 0x63, 0xa2, 0x02, 0x03, 0x53, 0x54, 0x58, 0xaa, 0x02,
+	0x14, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53,
+	0x76, 0x63, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x14, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
+	0x5c, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76, 0x63, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x20, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x5c, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76, 0x63,
+	0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea,
+	0x02, 0x16, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3a, 0x3a, 0x54, 0x61, 0x73, 0x6b,
+	0x73, 0x53, 0x76, 0x63, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2585,7 +2792,7 @@ func file_services_tasks_svc_v1_task_svc_proto_rawDescGZIP() []byte {
 	return file_services_tasks_svc_v1_task_svc_proto_rawDescData
 }
 
-var file_services_tasks_svc_v1_task_svc_proto_msgTypes = make([]protoimpl.MessageInfo, 36)
+var file_services_tasks_svc_v1_task_svc_proto_msgTypes = make([]protoimpl.MessageInfo, 38)
 var file_services_tasks_svc_v1_task_svc_proto_goTypes = []interface{}{
 	(*CreateTaskRequest)(nil),                                    // 0: services.tasks_svc.v1.CreateTaskRequest
 	(*CreateTaskResponse)(nil),                                   // 1: services.tasks_svc.v1.CreateTaskResponse
@@ -2607,83 +2814,88 @@ var file_services_tasks_svc_v1_task_svc_proto_goTypes = []interface{}{
 	(*CreateSubtaskResponse)(nil),                                // 17: services.tasks_svc.v1.CreateSubtaskResponse
 	(*UpdateSubtaskRequest)(nil),                                 // 18: services.tasks_svc.v1.UpdateSubtaskRequest
 	(*UpdateSubtaskResponse)(nil),                                // 19: services.tasks_svc.v1.UpdateSubtaskResponse
-	(*CompleteSubtaskRequest)(nil),                               // 20: services.tasks_svc.v1.CompleteSubtaskRequest
-	(*CompleteSubtaskResponse)(nil),                              // 21: services.tasks_svc.v1.CompleteSubtaskResponse
-	(*UncompleteSubtaskRequest)(nil),                             // 22: services.tasks_svc.v1.UncompleteSubtaskRequest
-	(*UncompleteSubtaskResponse)(nil),                            // 23: services.tasks_svc.v1.UncompleteSubtaskResponse
-	(*DeleteSubtaskRequest)(nil),                                 // 24: services.tasks_svc.v1.DeleteSubtaskRequest
-	(*DeleteSubtaskResponse)(nil),                                // 25: services.tasks_svc.v1.DeleteSubtaskResponse
-	(*GetTaskResponse_Subtask)(nil),                              // 26: services.tasks_svc.v1.GetTaskResponse.Subtask
-	(*GetTasksByPatientResponse_Task)(nil),                       // 27: services.tasks_svc.v1.GetTasksByPatientResponse.Task
-	(*GetTasksByPatientResponse_Task_SubTask)(nil),               // 28: services.tasks_svc.v1.GetTasksByPatientResponse.Task.SubTask
-	(*GetTasksByPatientSortedByStatusResponse_Task)(nil),         // 29: services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task
-	(*GetTasksByPatientSortedByStatusResponse_Task_SubTask)(nil), // 30: services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task.SubTask
-	(*GetAssignedTasksResponse_Task)(nil),                        // 31: services.tasks_svc.v1.GetAssignedTasksResponse.Task
-	(*GetAssignedTasksResponse_Task_Patient)(nil),                // 32: services.tasks_svc.v1.GetAssignedTasksResponse.Task.Patient
-	(*GetAssignedTasksResponse_Task_SubTask)(nil),                // 33: services.tasks_svc.v1.GetAssignedTasksResponse.Task.SubTask
-	(*CreateSubtaskRequest_Subtask)(nil),                         // 34: services.tasks_svc.v1.CreateSubtaskRequest.Subtask
-	(*UpdateSubtaskRequest_Subtask)(nil),                         // 35: services.tasks_svc.v1.UpdateSubtaskRequest.Subtask
-	(*timestamppb.Timestamp)(nil),                                // 36: google.protobuf.Timestamp
-	(TaskStatus)(0),                                              // 37: services.tasks_svc.v1.TaskStatus
+	(*DeleteSubtaskRequest)(nil),                                 // 20: services.tasks_svc.v1.DeleteSubtaskRequest
+	(*DeleteSubtaskResponse)(nil),                                // 21: services.tasks_svc.v1.DeleteSubtaskResponse
+	(*RemoveTaskDueDateRequest)(nil),                             // 22: services.tasks_svc.v1.RemoveTaskDueDateRequest
+	(*RemoveTaskDueDateResponse)(nil),                            // 23: services.tasks_svc.v1.RemoveTaskDueDateResponse
+	(*DeleteTaskRequest)(nil),                                    // 24: services.tasks_svc.v1.DeleteTaskRequest
+	(*DeleteTaskResponse)(nil),                                   // 25: services.tasks_svc.v1.DeleteTaskResponse
+	(*CreateTaskRequest_SubTask)(nil),                            // 26: services.tasks_svc.v1.CreateTaskRequest.SubTask
+	(*GetTaskResponse_Patient)(nil),                              // 27: services.tasks_svc.v1.GetTaskResponse.Patient
+	(*GetTaskResponse_SubTask)(nil),                              // 28: services.tasks_svc.v1.GetTaskResponse.SubTask
+	(*GetTasksByPatientResponse_Task)(nil),                       // 29: services.tasks_svc.v1.GetTasksByPatientResponse.Task
+	(*GetTasksByPatientResponse_Task_SubTask)(nil),               // 30: services.tasks_svc.v1.GetTasksByPatientResponse.Task.SubTask
+	(*GetTasksByPatientSortedByStatusResponse_Task)(nil),         // 31: services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task
+	(*GetTasksByPatientSortedByStatusResponse_Task_SubTask)(nil), // 32: services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task.SubTask
+	(*GetAssignedTasksResponse_Task)(nil),                        // 33: services.tasks_svc.v1.GetAssignedTasksResponse.Task
+	(*GetAssignedTasksResponse_Task_Patient)(nil),                // 34: services.tasks_svc.v1.GetAssignedTasksResponse.Task.Patient
+	(*GetAssignedTasksResponse_Task_SubTask)(nil),                // 35: services.tasks_svc.v1.GetAssignedTasksResponse.Task.SubTask
+	(*CreateSubtaskRequest_Subtask)(nil),                         // 36: services.tasks_svc.v1.CreateSubtaskRequest.Subtask
+	(*UpdateSubtaskRequest_Subtask)(nil),                         // 37: services.tasks_svc.v1.UpdateSubtaskRequest.Subtask
+	(*timestamppb.Timestamp)(nil),                                // 38: google.protobuf.Timestamp
+	(TaskStatus)(0),                                              // 39: services.tasks_svc.v1.TaskStatus
 }
 var file_services_tasks_svc_v1_task_svc_proto_depIdxs = []int32{
-	36, // 0: services.tasks_svc.v1.CreateTaskRequest.due_at:type_name -> google.protobuf.Timestamp
-	37, // 1: services.tasks_svc.v1.CreateTaskRequest.initial_status:type_name -> services.tasks_svc.v1.TaskStatus
-	36, // 2: services.tasks_svc.v1.UpdateTaskRequest.due_at:type_name -> google.protobuf.Timestamp
-	37, // 3: services.tasks_svc.v1.UpdateTaskRequest.status:type_name -> services.tasks_svc.v1.TaskStatus
-	26, // 4: services.tasks_svc.v1.GetTaskResponse.subtasks:type_name -> services.tasks_svc.v1.GetTaskResponse.Subtask
-	37, // 5: services.tasks_svc.v1.GetTaskResponse.status:type_name -> services.tasks_svc.v1.TaskStatus
-	36, // 6: services.tasks_svc.v1.GetTaskResponse.created_at:type_name -> google.protobuf.Timestamp
-	27, // 7: services.tasks_svc.v1.GetTasksByPatientResponse.tasks:type_name -> services.tasks_svc.v1.GetTasksByPatientResponse.Task
-	29, // 8: services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.todo:type_name -> services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task
-	29, // 9: services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.in_progress:type_name -> services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task
-	29, // 10: services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.done:type_name -> services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task
-	31, // 11: services.tasks_svc.v1.GetAssignedTasksResponse.tasks:type_name -> services.tasks_svc.v1.GetAssignedTasksResponse.Task
-	34, // 12: services.tasks_svc.v1.CreateSubtaskRequest.subtask:type_name -> services.tasks_svc.v1.CreateSubtaskRequest.Subtask
-	35, // 13: services.tasks_svc.v1.UpdateSubtaskRequest.subtask:type_name -> services.tasks_svc.v1.UpdateSubtaskRequest.Subtask
-	37, // 14: services.tasks_svc.v1.GetTasksByPatientResponse.Task.status:type_name -> services.tasks_svc.v1.TaskStatus
-	36, // 15: services.tasks_svc.v1.GetTasksByPatientResponse.Task.due_at:type_name -> google.protobuf.Timestamp
-	28, // 16: services.tasks_svc.v1.GetTasksByPatientResponse.Task.subtasks:type_name -> services.tasks_svc.v1.GetTasksByPatientResponse.Task.SubTask
-	36, // 17: services.tasks_svc.v1.GetTasksByPatientResponse.Task.created_at:type_name -> google.protobuf.Timestamp
-	36, // 18: services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task.due_at:type_name -> google.protobuf.Timestamp
-	30, // 19: services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task.subtasks:type_name -> services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task.SubTask
-	36, // 20: services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task.created_at:type_name -> google.protobuf.Timestamp
-	37, // 21: services.tasks_svc.v1.GetAssignedTasksResponse.Task.status:type_name -> services.tasks_svc.v1.TaskStatus
-	32, // 22: services.tasks_svc.v1.GetAssignedTasksResponse.Task.patient:type_name -> services.tasks_svc.v1.GetAssignedTasksResponse.Task.Patient
-	36, // 23: services.tasks_svc.v1.GetAssignedTasksResponse.Task.due_at:type_name -> google.protobuf.Timestamp
-	33, // 24: services.tasks_svc.v1.GetAssignedTasksResponse.Task.subtasks:type_name -> services.tasks_svc.v1.GetAssignedTasksResponse.Task.SubTask
-	36, // 25: services.tasks_svc.v1.GetAssignedTasksResponse.Task.created_at:type_name -> google.protobuf.Timestamp
-	0,  // 26: services.tasks_svc.v1.TaskService.CreateTask:input_type -> services.tasks_svc.v1.CreateTaskRequest
-	2,  // 27: services.tasks_svc.v1.TaskService.UpdateTask:input_type -> services.tasks_svc.v1.UpdateTaskRequest
-	4,  // 28: services.tasks_svc.v1.TaskService.GetTask:input_type -> services.tasks_svc.v1.GetTaskRequest
-	6,  // 29: services.tasks_svc.v1.TaskService.GetTasksByPatient:input_type -> services.tasks_svc.v1.GetTasksByPatientRequest
-	8,  // 30: services.tasks_svc.v1.TaskService.GetTasksByPatientSortedByStatus:input_type -> services.tasks_svc.v1.GetTasksByPatientSortedByStatusRequest
-	10, // 31: services.tasks_svc.v1.TaskService.GetAssignedTasks:input_type -> services.tasks_svc.v1.GetAssignedTasksRequest
-	12, // 32: services.tasks_svc.v1.TaskService.AssignTask:input_type -> services.tasks_svc.v1.AssignTaskRequest
-	14, // 33: services.tasks_svc.v1.TaskService.UnassignTask:input_type -> services.tasks_svc.v1.UnassignTaskRequest
-	16, // 34: services.tasks_svc.v1.TaskService.CreateSubtask:input_type -> services.tasks_svc.v1.CreateSubtaskRequest
-	18, // 35: services.tasks_svc.v1.TaskService.UpdateSubtask:input_type -> services.tasks_svc.v1.UpdateSubtaskRequest
-	20, // 36: services.tasks_svc.v1.TaskService.CompleteSubtask:input_type -> services.tasks_svc.v1.CompleteSubtaskRequest
-	22, // 37: services.tasks_svc.v1.TaskService.UncompleteSubtask:input_type -> services.tasks_svc.v1.UncompleteSubtaskRequest
-	24, // 38: services.tasks_svc.v1.TaskService.DeleteSubtask:input_type -> services.tasks_svc.v1.DeleteSubtaskRequest
-	1,  // 39: services.tasks_svc.v1.TaskService.CreateTask:output_type -> services.tasks_svc.v1.CreateTaskResponse
-	3,  // 40: services.tasks_svc.v1.TaskService.UpdateTask:output_type -> services.tasks_svc.v1.UpdateTaskResponse
-	5,  // 41: services.tasks_svc.v1.TaskService.GetTask:output_type -> services.tasks_svc.v1.GetTaskResponse
-	7,  // 42: services.tasks_svc.v1.TaskService.GetTasksByPatient:output_type -> services.tasks_svc.v1.GetTasksByPatientResponse
-	9,  // 43: services.tasks_svc.v1.TaskService.GetTasksByPatientSortedByStatus:output_type -> services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse
-	11, // 44: services.tasks_svc.v1.TaskService.GetAssignedTasks:output_type -> services.tasks_svc.v1.GetAssignedTasksResponse
-	13, // 45: services.tasks_svc.v1.TaskService.AssignTask:output_type -> services.tasks_svc.v1.AssignTaskResponse
-	15, // 46: services.tasks_svc.v1.TaskService.UnassignTask:output_type -> services.tasks_svc.v1.UnassignTaskResponse
-	17, // 47: services.tasks_svc.v1.TaskService.CreateSubtask:output_type -> services.tasks_svc.v1.CreateSubtaskResponse
-	19, // 48: services.tasks_svc.v1.TaskService.UpdateSubtask:output_type -> services.tasks_svc.v1.UpdateSubtaskResponse
-	21, // 49: services.tasks_svc.v1.TaskService.CompleteSubtask:output_type -> services.tasks_svc.v1.CompleteSubtaskResponse
-	23, // 50: services.tasks_svc.v1.TaskService.UncompleteSubtask:output_type -> services.tasks_svc.v1.UncompleteSubtaskResponse
-	25, // 51: services.tasks_svc.v1.TaskService.DeleteSubtask:output_type -> services.tasks_svc.v1.DeleteSubtaskResponse
-	39, // [39:52] is the sub-list for method output_type
-	26, // [26:39] is the sub-list for method input_type
-	26, // [26:26] is the sub-list for extension type_name
-	26, // [26:26] is the sub-list for extension extendee
-	0,  // [0:26] is the sub-list for field type_name
+	38, // 0: services.tasks_svc.v1.CreateTaskRequest.due_at:type_name -> google.protobuf.Timestamp
+	39, // 1: services.tasks_svc.v1.CreateTaskRequest.initial_status:type_name -> services.tasks_svc.v1.TaskStatus
+	26, // 2: services.tasks_svc.v1.CreateTaskRequest.subtasks:type_name -> services.tasks_svc.v1.CreateTaskRequest.SubTask
+	38, // 3: services.tasks_svc.v1.UpdateTaskRequest.due_at:type_name -> google.protobuf.Timestamp
+	39, // 4: services.tasks_svc.v1.UpdateTaskRequest.status:type_name -> services.tasks_svc.v1.TaskStatus
+	28, // 5: services.tasks_svc.v1.GetTaskResponse.subtasks:type_name -> services.tasks_svc.v1.GetTaskResponse.SubTask
+	39, // 6: services.tasks_svc.v1.GetTaskResponse.status:type_name -> services.tasks_svc.v1.TaskStatus
+	38, // 7: services.tasks_svc.v1.GetTaskResponse.created_at:type_name -> google.protobuf.Timestamp
+	38, // 8: services.tasks_svc.v1.GetTaskResponse.due_at:type_name -> google.protobuf.Timestamp
+	27, // 9: services.tasks_svc.v1.GetTaskResponse.patient:type_name -> services.tasks_svc.v1.GetTaskResponse.Patient
+	29, // 10: services.tasks_svc.v1.GetTasksByPatientResponse.tasks:type_name -> services.tasks_svc.v1.GetTasksByPatientResponse.Task
+	31, // 11: services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.todo:type_name -> services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task
+	31, // 12: services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.in_progress:type_name -> services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task
+	31, // 13: services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.done:type_name -> services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task
+	33, // 14: services.tasks_svc.v1.GetAssignedTasksResponse.tasks:type_name -> services.tasks_svc.v1.GetAssignedTasksResponse.Task
+	36, // 15: services.tasks_svc.v1.CreateSubtaskRequest.subtask:type_name -> services.tasks_svc.v1.CreateSubtaskRequest.Subtask
+	37, // 16: services.tasks_svc.v1.UpdateSubtaskRequest.subtask:type_name -> services.tasks_svc.v1.UpdateSubtaskRequest.Subtask
+	39, // 17: services.tasks_svc.v1.GetTasksByPatientResponse.Task.status:type_name -> services.tasks_svc.v1.TaskStatus
+	38, // 18: services.tasks_svc.v1.GetTasksByPatientResponse.Task.due_at:type_name -> google.protobuf.Timestamp
+	30, // 19: services.tasks_svc.v1.GetTasksByPatientResponse.Task.subtasks:type_name -> services.tasks_svc.v1.GetTasksByPatientResponse.Task.SubTask
+	38, // 20: services.tasks_svc.v1.GetTasksByPatientResponse.Task.created_at:type_name -> google.protobuf.Timestamp
+	38, // 21: services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task.due_at:type_name -> google.protobuf.Timestamp
+	32, // 22: services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task.subtasks:type_name -> services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task.SubTask
+	38, // 23: services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task.created_at:type_name -> google.protobuf.Timestamp
+	39, // 24: services.tasks_svc.v1.GetAssignedTasksResponse.Task.status:type_name -> services.tasks_svc.v1.TaskStatus
+	34, // 25: services.tasks_svc.v1.GetAssignedTasksResponse.Task.patient:type_name -> services.tasks_svc.v1.GetAssignedTasksResponse.Task.Patient
+	38, // 26: services.tasks_svc.v1.GetAssignedTasksResponse.Task.due_at:type_name -> google.protobuf.Timestamp
+	35, // 27: services.tasks_svc.v1.GetAssignedTasksResponse.Task.subtasks:type_name -> services.tasks_svc.v1.GetAssignedTasksResponse.Task.SubTask
+	38, // 28: services.tasks_svc.v1.GetAssignedTasksResponse.Task.created_at:type_name -> google.protobuf.Timestamp
+	0,  // 29: services.tasks_svc.v1.TaskService.CreateTask:input_type -> services.tasks_svc.v1.CreateTaskRequest
+	2,  // 30: services.tasks_svc.v1.TaskService.UpdateTask:input_type -> services.tasks_svc.v1.UpdateTaskRequest
+	4,  // 31: services.tasks_svc.v1.TaskService.GetTask:input_type -> services.tasks_svc.v1.GetTaskRequest
+	6,  // 32: services.tasks_svc.v1.TaskService.GetTasksByPatient:input_type -> services.tasks_svc.v1.GetTasksByPatientRequest
+	8,  // 33: services.tasks_svc.v1.TaskService.GetTasksByPatientSortedByStatus:input_type -> services.tasks_svc.v1.GetTasksByPatientSortedByStatusRequest
+	10, // 34: services.tasks_svc.v1.TaskService.GetAssignedTasks:input_type -> services.tasks_svc.v1.GetAssignedTasksRequest
+	12, // 35: services.tasks_svc.v1.TaskService.AssignTask:input_type -> services.tasks_svc.v1.AssignTaskRequest
+	14, // 36: services.tasks_svc.v1.TaskService.UnassignTask:input_type -> services.tasks_svc.v1.UnassignTaskRequest
+	16, // 37: services.tasks_svc.v1.TaskService.CreateSubtask:input_type -> services.tasks_svc.v1.CreateSubtaskRequest
+	18, // 38: services.tasks_svc.v1.TaskService.UpdateSubtask:input_type -> services.tasks_svc.v1.UpdateSubtaskRequest
+	20, // 39: services.tasks_svc.v1.TaskService.DeleteSubtask:input_type -> services.tasks_svc.v1.DeleteSubtaskRequest
+	22, // 40: services.tasks_svc.v1.TaskService.RemoveTaskDueDate:input_type -> services.tasks_svc.v1.RemoveTaskDueDateRequest
+	24, // 41: services.tasks_svc.v1.TaskService.DeleteTask:input_type -> services.tasks_svc.v1.DeleteTaskRequest
+	1,  // 42: services.tasks_svc.v1.TaskService.CreateTask:output_type -> services.tasks_svc.v1.CreateTaskResponse
+	3,  // 43: services.tasks_svc.v1.TaskService.UpdateTask:output_type -> services.tasks_svc.v1.UpdateTaskResponse
+	5,  // 44: services.tasks_svc.v1.TaskService.GetTask:output_type -> services.tasks_svc.v1.GetTaskResponse
+	7,  // 45: services.tasks_svc.v1.TaskService.GetTasksByPatient:output_type -> services.tasks_svc.v1.GetTasksByPatientResponse
+	9,  // 46: services.tasks_svc.v1.TaskService.GetTasksByPatientSortedByStatus:output_type -> services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse
+	11, // 47: services.tasks_svc.v1.TaskService.GetAssignedTasks:output_type -> services.tasks_svc.v1.GetAssignedTasksResponse
+	13, // 48: services.tasks_svc.v1.TaskService.AssignTask:output_type -> services.tasks_svc.v1.AssignTaskResponse
+	15, // 49: services.tasks_svc.v1.TaskService.UnassignTask:output_type -> services.tasks_svc.v1.UnassignTaskResponse
+	17, // 50: services.tasks_svc.v1.TaskService.CreateSubtask:output_type -> services.tasks_svc.v1.CreateSubtaskResponse
+	19, // 51: services.tasks_svc.v1.TaskService.UpdateSubtask:output_type -> services.tasks_svc.v1.UpdateSubtaskResponse
+	21, // 52: services.tasks_svc.v1.TaskService.DeleteSubtask:output_type -> services.tasks_svc.v1.DeleteSubtaskResponse
+	23, // 53: services.tasks_svc.v1.TaskService.RemoveTaskDueDate:output_type -> services.tasks_svc.v1.RemoveTaskDueDateResponse
+	25, // 54: services.tasks_svc.v1.TaskService.DeleteTask:output_type -> services.tasks_svc.v1.DeleteTaskResponse
+	42, // [42:55] is the sub-list for method output_type
+	29, // [29:42] is the sub-list for method input_type
+	29, // [29:29] is the sub-list for extension type_name
+	29, // [29:29] is the sub-list for extension extendee
+	0,  // [0:29] is the sub-list for field type_name
 }
 
 func init() { file_services_tasks_svc_v1_task_svc_proto_init() }
@@ -2934,7 +3146,7 @@ func file_services_tasks_svc_v1_task_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_svc_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CompleteSubtaskRequest); i {
+			switch v := v.(*DeleteSubtaskRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2946,7 +3158,7 @@ func file_services_tasks_svc_v1_task_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_svc_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CompleteSubtaskResponse); i {
+			switch v := v.(*DeleteSubtaskResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2958,7 +3170,7 @@ func file_services_tasks_svc_v1_task_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_svc_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UncompleteSubtaskRequest); i {
+			switch v := v.(*RemoveTaskDueDateRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2970,7 +3182,7 @@ func file_services_tasks_svc_v1_task_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_svc_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UncompleteSubtaskResponse); i {
+			switch v := v.(*RemoveTaskDueDateResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2982,7 +3194,7 @@ func file_services_tasks_svc_v1_task_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_svc_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DeleteSubtaskRequest); i {
+			switch v := v.(*DeleteTaskRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2994,7 +3206,7 @@ func file_services_tasks_svc_v1_task_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_svc_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DeleteSubtaskResponse); i {
+			switch v := v.(*DeleteTaskResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3006,7 +3218,7 @@ func file_services_tasks_svc_v1_task_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_svc_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetTaskResponse_Subtask); i {
+			switch v := v.(*CreateTaskRequest_SubTask); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3018,7 +3230,7 @@ func file_services_tasks_svc_v1_task_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_svc_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetTasksByPatientResponse_Task); i {
+			switch v := v.(*GetTaskResponse_Patient); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3030,7 +3242,7 @@ func file_services_tasks_svc_v1_task_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_svc_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetTasksByPatientResponse_Task_SubTask); i {
+			switch v := v.(*GetTaskResponse_SubTask); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3042,7 +3254,7 @@ func file_services_tasks_svc_v1_task_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_svc_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetTasksByPatientSortedByStatusResponse_Task); i {
+			switch v := v.(*GetTasksByPatientResponse_Task); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3054,7 +3266,7 @@ func file_services_tasks_svc_v1_task_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_svc_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetTasksByPatientSortedByStatusResponse_Task_SubTask); i {
+			switch v := v.(*GetTasksByPatientResponse_Task_SubTask); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3066,7 +3278,7 @@ func file_services_tasks_svc_v1_task_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_svc_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetAssignedTasksResponse_Task); i {
+			switch v := v.(*GetTasksByPatientSortedByStatusResponse_Task); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3078,7 +3290,7 @@ func file_services_tasks_svc_v1_task_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_svc_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetAssignedTasksResponse_Task_Patient); i {
+			switch v := v.(*GetTasksByPatientSortedByStatusResponse_Task_SubTask); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3090,7 +3302,7 @@ func file_services_tasks_svc_v1_task_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_svc_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetAssignedTasksResponse_Task_SubTask); i {
+			switch v := v.(*GetAssignedTasksResponse_Task); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3102,7 +3314,7 @@ func file_services_tasks_svc_v1_task_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_svc_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CreateSubtaskRequest_Subtask); i {
+			switch v := v.(*GetAssignedTasksResponse_Task_Patient); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3114,6 +3326,30 @@ func file_services_tasks_svc_v1_task_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_svc_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GetAssignedTasksResponse_Task_SubTask); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_services_tasks_svc_v1_task_svc_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CreateSubtaskRequest_Subtask); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_services_tasks_svc_v1_task_svc_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateSubtaskRequest_Subtask); i {
 			case 0:
 				return &v.state
@@ -3129,16 +3365,16 @@ func file_services_tasks_svc_v1_task_svc_proto_init() {
 	file_services_tasks_svc_v1_task_svc_proto_msgTypes[0].OneofWrappers = []interface{}{}
 	file_services_tasks_svc_v1_task_svc_proto_msgTypes[2].OneofWrappers = []interface{}{}
 	file_services_tasks_svc_v1_task_svc_proto_msgTypes[5].OneofWrappers = []interface{}{}
-	file_services_tasks_svc_v1_task_svc_proto_msgTypes[27].OneofWrappers = []interface{}{}
 	file_services_tasks_svc_v1_task_svc_proto_msgTypes[29].OneofWrappers = []interface{}{}
-	file_services_tasks_svc_v1_task_svc_proto_msgTypes[35].OneofWrappers = []interface{}{}
+	file_services_tasks_svc_v1_task_svc_proto_msgTypes[31].OneofWrappers = []interface{}{}
+	file_services_tasks_svc_v1_task_svc_proto_msgTypes[37].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_services_tasks_svc_v1_task_svc_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   36,
+			NumMessages:   38,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/gen/go/services/tasks_svc/v1/task_svc_grpc.pb.go b/gen/go/services/tasks_svc/v1/task_svc_grpc.pb.go
index dc2d8b445..fff825f90 100644
--- a/gen/go/services/tasks_svc/v1/task_svc_grpc.pb.go
+++ b/gen/go/services/tasks_svc/v1/task_svc_grpc.pb.go
@@ -29,9 +29,9 @@ const (
 	TaskService_UnassignTask_FullMethodName                    = "/services.tasks_svc.v1.TaskService/UnassignTask"
 	TaskService_CreateSubtask_FullMethodName                   = "/services.tasks_svc.v1.TaskService/CreateSubtask"
 	TaskService_UpdateSubtask_FullMethodName                   = "/services.tasks_svc.v1.TaskService/UpdateSubtask"
-	TaskService_CompleteSubtask_FullMethodName                 = "/services.tasks_svc.v1.TaskService/CompleteSubtask"
-	TaskService_UncompleteSubtask_FullMethodName               = "/services.tasks_svc.v1.TaskService/UncompleteSubtask"
 	TaskService_DeleteSubtask_FullMethodName                   = "/services.tasks_svc.v1.TaskService/DeleteSubtask"
+	TaskService_RemoveTaskDueDate_FullMethodName               = "/services.tasks_svc.v1.TaskService/RemoveTaskDueDate"
+	TaskService_DeleteTask_FullMethodName                      = "/services.tasks_svc.v1.TaskService/DeleteTask"
 )
 
 // TaskServiceClient is the client API for TaskService service.
@@ -48,9 +48,9 @@ type TaskServiceClient interface {
 	UnassignTask(ctx context.Context, in *UnassignTaskRequest, opts ...grpc.CallOption) (*UnassignTaskResponse, error)
 	CreateSubtask(ctx context.Context, in *CreateSubtaskRequest, opts ...grpc.CallOption) (*CreateSubtaskResponse, error)
 	UpdateSubtask(ctx context.Context, in *UpdateSubtaskRequest, opts ...grpc.CallOption) (*UpdateSubtaskResponse, error)
-	CompleteSubtask(ctx context.Context, in *CompleteSubtaskRequest, opts ...grpc.CallOption) (*CompleteSubtaskResponse, error)
-	UncompleteSubtask(ctx context.Context, in *UncompleteSubtaskRequest, opts ...grpc.CallOption) (*UncompleteSubtaskResponse, error)
 	DeleteSubtask(ctx context.Context, in *DeleteSubtaskRequest, opts ...grpc.CallOption) (*DeleteSubtaskResponse, error)
+	RemoveTaskDueDate(ctx context.Context, in *RemoveTaskDueDateRequest, opts ...grpc.CallOption) (*RemoveTaskDueDateResponse, error)
+	DeleteTask(ctx context.Context, in *DeleteTaskRequest, opts ...grpc.CallOption) (*DeleteTaskResponse, error)
 }
 
 type taskServiceClient struct {
@@ -161,30 +161,30 @@ func (c *taskServiceClient) UpdateSubtask(ctx context.Context, in *UpdateSubtask
 	return out, nil
 }
 
-func (c *taskServiceClient) CompleteSubtask(ctx context.Context, in *CompleteSubtaskRequest, opts ...grpc.CallOption) (*CompleteSubtaskResponse, error) {
+func (c *taskServiceClient) DeleteSubtask(ctx context.Context, in *DeleteSubtaskRequest, opts ...grpc.CallOption) (*DeleteSubtaskResponse, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(CompleteSubtaskResponse)
-	err := c.cc.Invoke(ctx, TaskService_CompleteSubtask_FullMethodName, in, out, cOpts...)
+	out := new(DeleteSubtaskResponse)
+	err := c.cc.Invoke(ctx, TaskService_DeleteSubtask_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *taskServiceClient) UncompleteSubtask(ctx context.Context, in *UncompleteSubtaskRequest, opts ...grpc.CallOption) (*UncompleteSubtaskResponse, error) {
+func (c *taskServiceClient) RemoveTaskDueDate(ctx context.Context, in *RemoveTaskDueDateRequest, opts ...grpc.CallOption) (*RemoveTaskDueDateResponse, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(UncompleteSubtaskResponse)
-	err := c.cc.Invoke(ctx, TaskService_UncompleteSubtask_FullMethodName, in, out, cOpts...)
+	out := new(RemoveTaskDueDateResponse)
+	err := c.cc.Invoke(ctx, TaskService_RemoveTaskDueDate_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *taskServiceClient) DeleteSubtask(ctx context.Context, in *DeleteSubtaskRequest, opts ...grpc.CallOption) (*DeleteSubtaskResponse, error) {
+func (c *taskServiceClient) DeleteTask(ctx context.Context, in *DeleteTaskRequest, opts ...grpc.CallOption) (*DeleteTaskResponse, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(DeleteSubtaskResponse)
-	err := c.cc.Invoke(ctx, TaskService_DeleteSubtask_FullMethodName, in, out, cOpts...)
+	out := new(DeleteTaskResponse)
+	err := c.cc.Invoke(ctx, TaskService_DeleteTask_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -205,9 +205,9 @@ type TaskServiceServer interface {
 	UnassignTask(context.Context, *UnassignTaskRequest) (*UnassignTaskResponse, error)
 	CreateSubtask(context.Context, *CreateSubtaskRequest) (*CreateSubtaskResponse, error)
 	UpdateSubtask(context.Context, *UpdateSubtaskRequest) (*UpdateSubtaskResponse, error)
-	CompleteSubtask(context.Context, *CompleteSubtaskRequest) (*CompleteSubtaskResponse, error)
-	UncompleteSubtask(context.Context, *UncompleteSubtaskRequest) (*UncompleteSubtaskResponse, error)
 	DeleteSubtask(context.Context, *DeleteSubtaskRequest) (*DeleteSubtaskResponse, error)
+	RemoveTaskDueDate(context.Context, *RemoveTaskDueDateRequest) (*RemoveTaskDueDateResponse, error)
+	DeleteTask(context.Context, *DeleteTaskRequest) (*DeleteTaskResponse, error)
 	mustEmbedUnimplementedTaskServiceServer()
 }
 
@@ -245,15 +245,15 @@ func (UnimplementedTaskServiceServer) CreateSubtask(context.Context, *CreateSubt
 func (UnimplementedTaskServiceServer) UpdateSubtask(context.Context, *UpdateSubtaskRequest) (*UpdateSubtaskResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateSubtask not implemented")
 }
-func (UnimplementedTaskServiceServer) CompleteSubtask(context.Context, *CompleteSubtaskRequest) (*CompleteSubtaskResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method CompleteSubtask not implemented")
-}
-func (UnimplementedTaskServiceServer) UncompleteSubtask(context.Context, *UncompleteSubtaskRequest) (*UncompleteSubtaskResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method UncompleteSubtask not implemented")
-}
 func (UnimplementedTaskServiceServer) DeleteSubtask(context.Context, *DeleteSubtaskRequest) (*DeleteSubtaskResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteSubtask not implemented")
 }
+func (UnimplementedTaskServiceServer) RemoveTaskDueDate(context.Context, *RemoveTaskDueDateRequest) (*RemoveTaskDueDateResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method RemoveTaskDueDate not implemented")
+}
+func (UnimplementedTaskServiceServer) DeleteTask(context.Context, *DeleteTaskRequest) (*DeleteTaskResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method DeleteTask not implemented")
+}
 func (UnimplementedTaskServiceServer) mustEmbedUnimplementedTaskServiceServer() {}
 
 // UnsafeTaskServiceServer may be embedded to opt out of forward compatibility for this service.
@@ -447,56 +447,56 @@ func _TaskService_UpdateSubtask_Handler(srv interface{}, ctx context.Context, de
 	return interceptor(ctx, in, info, handler)
 }
 
-func _TaskService_CompleteSubtask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CompleteSubtaskRequest)
+func _TaskService_DeleteSubtask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteSubtaskRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(TaskServiceServer).CompleteSubtask(ctx, in)
+		return srv.(TaskServiceServer).DeleteSubtask(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: TaskService_CompleteSubtask_FullMethodName,
+		FullMethod: TaskService_DeleteSubtask_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TaskServiceServer).CompleteSubtask(ctx, req.(*CompleteSubtaskRequest))
+		return srv.(TaskServiceServer).DeleteSubtask(ctx, req.(*DeleteSubtaskRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _TaskService_UncompleteSubtask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UncompleteSubtaskRequest)
+func _TaskService_RemoveTaskDueDate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RemoveTaskDueDateRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(TaskServiceServer).UncompleteSubtask(ctx, in)
+		return srv.(TaskServiceServer).RemoveTaskDueDate(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: TaskService_UncompleteSubtask_FullMethodName,
+		FullMethod: TaskService_RemoveTaskDueDate_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TaskServiceServer).UncompleteSubtask(ctx, req.(*UncompleteSubtaskRequest))
+		return srv.(TaskServiceServer).RemoveTaskDueDate(ctx, req.(*RemoveTaskDueDateRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _TaskService_DeleteSubtask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteSubtaskRequest)
+func _TaskService_DeleteTask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteTaskRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(TaskServiceServer).DeleteSubtask(ctx, in)
+		return srv.(TaskServiceServer).DeleteTask(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: TaskService_DeleteSubtask_FullMethodName,
+		FullMethod: TaskService_DeleteTask_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TaskServiceServer).DeleteSubtask(ctx, req.(*DeleteSubtaskRequest))
+		return srv.(TaskServiceServer).DeleteTask(ctx, req.(*DeleteTaskRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -549,16 +549,16 @@ var TaskService_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _TaskService_UpdateSubtask_Handler,
 		},
 		{
-			MethodName: "CompleteSubtask",
-			Handler:    _TaskService_CompleteSubtask_Handler,
+			MethodName: "DeleteSubtask",
+			Handler:    _TaskService_DeleteSubtask_Handler,
 		},
 		{
-			MethodName: "UncompleteSubtask",
-			Handler:    _TaskService_UncompleteSubtask_Handler,
+			MethodName: "RemoveTaskDueDate",
+			Handler:    _TaskService_RemoveTaskDueDate_Handler,
 		},
 		{
-			MethodName: "DeleteSubtask",
-			Handler:    _TaskService_DeleteSubtask_Handler,
+			MethodName: "DeleteTask",
+			Handler:    _TaskService_DeleteTask_Handler,
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
diff --git a/gen/go/services/tasks_svc/v1/task_template_svc.pb.go b/gen/go/services/tasks_svc/v1/task_template_svc.pb.go
index d10bb46f4..5ac985772 100644
--- a/gen/go/services/tasks_svc/v1/task_template_svc.pb.go
+++ b/gen/go/services/tasks_svc/v1/task_template_svc.pb.go
@@ -138,91 +138,6 @@ func (x *CreateTaskTemplateResponse) GetId() string {
 	return ""
 }
 
-type GetAllTaskTemplatesRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *GetAllTaskTemplatesRequest) Reset() {
-	*x = GetAllTaskTemplatesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetAllTaskTemplatesRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetAllTaskTemplatesRequest) ProtoMessage() {}
-
-func (x *GetAllTaskTemplatesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetAllTaskTemplatesRequest.ProtoReflect.Descriptor instead.
-func (*GetAllTaskTemplatesRequest) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{2}
-}
-
-type GetAllTaskTemplatesResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Templates []*GetAllTaskTemplatesResponse_TaskTemplate `protobuf:"bytes,1,rep,name=templates,proto3" json:"templates,omitempty"`
-}
-
-func (x *GetAllTaskTemplatesResponse) Reset() {
-	*x = GetAllTaskTemplatesResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetAllTaskTemplatesResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetAllTaskTemplatesResponse) ProtoMessage() {}
-
-func (x *GetAllTaskTemplatesResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetAllTaskTemplatesResponse.ProtoReflect.Descriptor instead.
-func (*GetAllTaskTemplatesResponse) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *GetAllTaskTemplatesResponse) GetTemplates() []*GetAllTaskTemplatesResponse_TaskTemplate {
-	if x != nil {
-		return x.Templates
-	}
-	return nil
-}
-
 type DeleteTaskTemplateRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -234,7 +149,7 @@ type DeleteTaskTemplateRequest struct {
 func (x *DeleteTaskTemplateRequest) Reset() {
 	*x = DeleteTaskTemplateRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[4]
+		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -247,7 +162,7 @@ func (x *DeleteTaskTemplateRequest) String() string {
 func (*DeleteTaskTemplateRequest) ProtoMessage() {}
 
 func (x *DeleteTaskTemplateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[4]
+	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -260,7 +175,7 @@ func (x *DeleteTaskTemplateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteTaskTemplateRequest.ProtoReflect.Descriptor instead.
 func (*DeleteTaskTemplateRequest) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{4}
+	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *DeleteTaskTemplateRequest) GetId() string {
@@ -279,7 +194,7 @@ type DeleteTaskTemplateResponse struct {
 func (x *DeleteTaskTemplateResponse) Reset() {
 	*x = DeleteTaskTemplateResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[5]
+		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -292,7 +207,7 @@ func (x *DeleteTaskTemplateResponse) String() string {
 func (*DeleteTaskTemplateResponse) ProtoMessage() {}
 
 func (x *DeleteTaskTemplateResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[5]
+	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -305,7 +220,7 @@ func (x *DeleteTaskTemplateResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteTaskTemplateResponse.ProtoReflect.Descriptor instead.
 func (*DeleteTaskTemplateResponse) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{5}
+	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{3}
 }
 
 type DeleteTaskTemplateSubTaskRequest struct {
@@ -319,7 +234,7 @@ type DeleteTaskTemplateSubTaskRequest struct {
 func (x *DeleteTaskTemplateSubTaskRequest) Reset() {
 	*x = DeleteTaskTemplateSubTaskRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[6]
+		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -332,7 +247,7 @@ func (x *DeleteTaskTemplateSubTaskRequest) String() string {
 func (*DeleteTaskTemplateSubTaskRequest) ProtoMessage() {}
 
 func (x *DeleteTaskTemplateSubTaskRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[6]
+	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -345,7 +260,7 @@ func (x *DeleteTaskTemplateSubTaskRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteTaskTemplateSubTaskRequest.ProtoReflect.Descriptor instead.
 func (*DeleteTaskTemplateSubTaskRequest) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{6}
+	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *DeleteTaskTemplateSubTaskRequest) GetId() string {
@@ -364,7 +279,7 @@ type DeleteTaskTemplateSubTaskResponse struct {
 func (x *DeleteTaskTemplateSubTaskResponse) Reset() {
 	*x = DeleteTaskTemplateSubTaskResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[7]
+		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -377,7 +292,7 @@ func (x *DeleteTaskTemplateSubTaskResponse) String() string {
 func (*DeleteTaskTemplateSubTaskResponse) ProtoMessage() {}
 
 func (x *DeleteTaskTemplateSubTaskResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[7]
+	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -390,7 +305,7 @@ func (x *DeleteTaskTemplateSubTaskResponse) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use DeleteTaskTemplateSubTaskResponse.ProtoReflect.Descriptor instead.
 func (*DeleteTaskTemplateSubTaskResponse) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{7}
+	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{5}
 }
 
 type UpdateTaskTemplateRequest struct {
@@ -406,7 +321,7 @@ type UpdateTaskTemplateRequest struct {
 func (x *UpdateTaskTemplateRequest) Reset() {
 	*x = UpdateTaskTemplateRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[8]
+		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -419,7 +334,7 @@ func (x *UpdateTaskTemplateRequest) String() string {
 func (*UpdateTaskTemplateRequest) ProtoMessage() {}
 
 func (x *UpdateTaskTemplateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[8]
+	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -432,7 +347,7 @@ func (x *UpdateTaskTemplateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateTaskTemplateRequest.ProtoReflect.Descriptor instead.
 func (*UpdateTaskTemplateRequest) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{8}
+	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *UpdateTaskTemplateRequest) GetId() string {
@@ -465,7 +380,7 @@ type UpdateTaskTemplateResponse struct {
 func (x *UpdateTaskTemplateResponse) Reset() {
 	*x = UpdateTaskTemplateResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[9]
+		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -478,7 +393,7 @@ func (x *UpdateTaskTemplateResponse) String() string {
 func (*UpdateTaskTemplateResponse) ProtoMessage() {}
 
 func (x *UpdateTaskTemplateResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[9]
+	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -491,7 +406,7 @@ func (x *UpdateTaskTemplateResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateTaskTemplateResponse.ProtoReflect.Descriptor instead.
 func (*UpdateTaskTemplateResponse) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{9}
+	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{7}
 }
 
 type UpdateTaskTemplateSubTaskRequest struct {
@@ -506,7 +421,7 @@ type UpdateTaskTemplateSubTaskRequest struct {
 func (x *UpdateTaskTemplateSubTaskRequest) Reset() {
 	*x = UpdateTaskTemplateSubTaskRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[10]
+		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -519,7 +434,7 @@ func (x *UpdateTaskTemplateSubTaskRequest) String() string {
 func (*UpdateTaskTemplateSubTaskRequest) ProtoMessage() {}
 
 func (x *UpdateTaskTemplateSubTaskRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[10]
+	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -532,7 +447,7 @@ func (x *UpdateTaskTemplateSubTaskRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateTaskTemplateSubTaskRequest.ProtoReflect.Descriptor instead.
 func (*UpdateTaskTemplateSubTaskRequest) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{10}
+	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *UpdateTaskTemplateSubTaskRequest) GetSubtaskId() string {
@@ -558,7 +473,7 @@ type UpdateTaskTemplateSubTaskResponse struct {
 func (x *UpdateTaskTemplateSubTaskResponse) Reset() {
 	*x = UpdateTaskTemplateSubTaskResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[11]
+		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -571,7 +486,7 @@ func (x *UpdateTaskTemplateSubTaskResponse) String() string {
 func (*UpdateTaskTemplateSubTaskResponse) ProtoMessage() {}
 
 func (x *UpdateTaskTemplateSubTaskResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[11]
+	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -584,7 +499,7 @@ func (x *UpdateTaskTemplateSubTaskResponse) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use UpdateTaskTemplateSubTaskResponse.ProtoReflect.Descriptor instead.
 func (*UpdateTaskTemplateSubTaskResponse) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{11}
+	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{9}
 }
 
 type CreateTaskTemplateSubTaskRequest struct {
@@ -599,7 +514,7 @@ type CreateTaskTemplateSubTaskRequest struct {
 func (x *CreateTaskTemplateSubTaskRequest) Reset() {
 	*x = CreateTaskTemplateSubTaskRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[12]
+		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -612,7 +527,7 @@ func (x *CreateTaskTemplateSubTaskRequest) String() string {
 func (*CreateTaskTemplateSubTaskRequest) ProtoMessage() {}
 
 func (x *CreateTaskTemplateSubTaskRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[12]
+	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -625,7 +540,7 @@ func (x *CreateTaskTemplateSubTaskRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CreateTaskTemplateSubTaskRequest.ProtoReflect.Descriptor instead.
 func (*CreateTaskTemplateSubTaskRequest) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{12}
+	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *CreateTaskTemplateSubTaskRequest) GetTaskTemplateId() string {
@@ -653,7 +568,7 @@ type CreateTaskTemplateSubTaskResponse struct {
 func (x *CreateTaskTemplateSubTaskResponse) Reset() {
 	*x = CreateTaskTemplateSubTaskResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[13]
+		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -666,7 +581,7 @@ func (x *CreateTaskTemplateSubTaskResponse) String() string {
 func (*CreateTaskTemplateSubTaskResponse) ProtoMessage() {}
 
 func (x *CreateTaskTemplateSubTaskResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[13]
+	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -679,7 +594,7 @@ func (x *CreateTaskTemplateSubTaskResponse) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use CreateTaskTemplateSubTaskResponse.ProtoReflect.Descriptor instead.
 func (*CreateTaskTemplateSubTaskResponse) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{13}
+	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *CreateTaskTemplateSubTaskResponse) GetId() string {
@@ -689,32 +604,33 @@ func (x *CreateTaskTemplateSubTaskResponse) GetId() string {
 	return ""
 }
 
-type GetAllTaskTemplatesByCreatorRequest struct {
+type GetAllTaskTemplatesRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	CreatedBy   string `protobuf:"bytes,1,opt,name=created_by,json=createdBy,proto3" json:"created_by,omitempty" validate:"required"` // @gotags: validate:"required"
-	PrivateOnly *bool  `protobuf:"varint,2,opt,name=private_only,json=privateOnly,proto3,oneof" json:"private_only,omitempty"`
+	WardId      *string `protobuf:"bytes,1,opt,name=ward_id,json=wardId,proto3,oneof" json:"ward_id,omitempty" validate:"omitempty,omitnil,uuid4"`          // @gotags: validate:"omitempty,omitnil,uuid4"
+	CreatedBy   *string `protobuf:"bytes,2,opt,name=created_by,json=createdBy,proto3,oneof" json:"created_by,omitempty" validate:"omitempty,omitnil,uuid4"` // @gotags: validate:"omitempty,omitnil,uuid4"
+	PrivateOnly bool    `protobuf:"varint,3,opt,name=private_only,json=privateOnly,proto3" json:"private_only,omitempty"`
 }
 
-func (x *GetAllTaskTemplatesByCreatorRequest) Reset() {
-	*x = GetAllTaskTemplatesByCreatorRequest{}
+func (x *GetAllTaskTemplatesRequest) Reset() {
+	*x = GetAllTaskTemplatesRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[14]
+		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
 }
 
-func (x *GetAllTaskTemplatesByCreatorRequest) String() string {
+func (x *GetAllTaskTemplatesRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*GetAllTaskTemplatesByCreatorRequest) ProtoMessage() {}
+func (*GetAllTaskTemplatesRequest) ProtoMessage() {}
 
-func (x *GetAllTaskTemplatesByCreatorRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[14]
+func (x *GetAllTaskTemplatesRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -725,144 +641,57 @@ func (x *GetAllTaskTemplatesByCreatorRequest) ProtoReflect() protoreflect.Messag
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GetAllTaskTemplatesByCreatorRequest.ProtoReflect.Descriptor instead.
-func (*GetAllTaskTemplatesByCreatorRequest) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{14}
+// Deprecated: Use GetAllTaskTemplatesRequest.ProtoReflect.Descriptor instead.
+func (*GetAllTaskTemplatesRequest) Descriptor() ([]byte, []int) {
+	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{12}
 }
 
-func (x *GetAllTaskTemplatesByCreatorRequest) GetCreatedBy() string {
-	if x != nil {
-		return x.CreatedBy
+func (x *GetAllTaskTemplatesRequest) GetWardId() string {
+	if x != nil && x.WardId != nil {
+		return *x.WardId
 	}
 	return ""
 }
 
-func (x *GetAllTaskTemplatesByCreatorRequest) GetPrivateOnly() bool {
-	if x != nil && x.PrivateOnly != nil {
-		return *x.PrivateOnly
-	}
-	return false
-}
-
-type GetAllTaskTemplatesByCreatorResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Templates []*GetAllTaskTemplatesByCreatorResponse_TaskTemplate `protobuf:"bytes,1,rep,name=templates,proto3" json:"templates,omitempty"`
-}
-
-func (x *GetAllTaskTemplatesByCreatorResponse) Reset() {
-	*x = GetAllTaskTemplatesByCreatorResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[15]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetAllTaskTemplatesByCreatorResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetAllTaskTemplatesByCreatorResponse) ProtoMessage() {}
-
-func (x *GetAllTaskTemplatesByCreatorResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[15]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetAllTaskTemplatesByCreatorResponse.ProtoReflect.Descriptor instead.
-func (*GetAllTaskTemplatesByCreatorResponse) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{15}
-}
-
-func (x *GetAllTaskTemplatesByCreatorResponse) GetTemplates() []*GetAllTaskTemplatesByCreatorResponse_TaskTemplate {
-	if x != nil {
-		return x.Templates
-	}
-	return nil
-}
-
-type GetAllTaskTemplatesByWardRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	WardId string `protobuf:"bytes,1,opt,name=ward_id,json=wardId,proto3" json:"ward_id,omitempty"`
-}
-
-func (x *GetAllTaskTemplatesByWardRequest) Reset() {
-	*x = GetAllTaskTemplatesByWardRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[16]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetAllTaskTemplatesByWardRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetAllTaskTemplatesByWardRequest) ProtoMessage() {}
-
-func (x *GetAllTaskTemplatesByWardRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[16]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
+func (x *GetAllTaskTemplatesRequest) GetCreatedBy() string {
+	if x != nil && x.CreatedBy != nil {
+		return *x.CreatedBy
 	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetAllTaskTemplatesByWardRequest.ProtoReflect.Descriptor instead.
-func (*GetAllTaskTemplatesByWardRequest) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{16}
+	return ""
 }
 
-func (x *GetAllTaskTemplatesByWardRequest) GetWardId() string {
+func (x *GetAllTaskTemplatesRequest) GetPrivateOnly() bool {
 	if x != nil {
-		return x.WardId
+		return x.PrivateOnly
 	}
-	return ""
+	return false
 }
 
-type GetAllTaskTemplatesByWardResponse struct {
+type GetAllTaskTemplatesResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Templates []*GetAllTaskTemplatesByWardResponse_TaskTemplate `protobuf:"bytes,1,rep,name=templates,proto3" json:"templates,omitempty"`
+	Templates []*GetAllTaskTemplatesResponse_TaskTemplate `protobuf:"bytes,1,rep,name=templates,proto3" json:"templates,omitempty"`
 }
 
-func (x *GetAllTaskTemplatesByWardResponse) Reset() {
-	*x = GetAllTaskTemplatesByWardResponse{}
+func (x *GetAllTaskTemplatesResponse) Reset() {
+	*x = GetAllTaskTemplatesResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[17]
+		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
 }
 
-func (x *GetAllTaskTemplatesByWardResponse) String() string {
+func (x *GetAllTaskTemplatesResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*GetAllTaskTemplatesByWardResponse) ProtoMessage() {}
+func (*GetAllTaskTemplatesResponse) ProtoMessage() {}
 
-func (x *GetAllTaskTemplatesByWardResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[17]
+func (x *GetAllTaskTemplatesResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -873,12 +702,12 @@ func (x *GetAllTaskTemplatesByWardResponse) ProtoReflect() protoreflect.Message
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GetAllTaskTemplatesByWardResponse.ProtoReflect.Descriptor instead.
-func (*GetAllTaskTemplatesByWardResponse) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{17}
+// Deprecated: Use GetAllTaskTemplatesResponse.ProtoReflect.Descriptor instead.
+func (*GetAllTaskTemplatesResponse) Descriptor() ([]byte, []int) {
+	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{13}
 }
 
-func (x *GetAllTaskTemplatesByWardResponse) GetTemplates() []*GetAllTaskTemplatesByWardResponse_TaskTemplate {
+func (x *GetAllTaskTemplatesResponse) GetTemplates() []*GetAllTaskTemplatesResponse_TaskTemplate {
 	if x != nil {
 		return x.Templates
 	}
@@ -896,7 +725,7 @@ type CreateTaskTemplateRequest_SubTask struct {
 func (x *CreateTaskTemplateRequest_SubTask) Reset() {
 	*x = CreateTaskTemplateRequest_SubTask{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[18]
+		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -909,7 +738,7 @@ func (x *CreateTaskTemplateRequest_SubTask) String() string {
 func (*CreateTaskTemplateRequest_SubTask) ProtoMessage() {}
 
 func (x *CreateTaskTemplateRequest_SubTask) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[18]
+	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -948,7 +777,7 @@ type GetAllTaskTemplatesResponse_TaskTemplate struct {
 func (x *GetAllTaskTemplatesResponse_TaskTemplate) Reset() {
 	*x = GetAllTaskTemplatesResponse_TaskTemplate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[19]
+		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -961,7 +790,7 @@ func (x *GetAllTaskTemplatesResponse_TaskTemplate) String() string {
 func (*GetAllTaskTemplatesResponse_TaskTemplate) ProtoMessage() {}
 
 func (x *GetAllTaskTemplatesResponse_TaskTemplate) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[19]
+	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -974,7 +803,7 @@ func (x *GetAllTaskTemplatesResponse_TaskTemplate) ProtoReflect() protoreflect.M
 
 // Deprecated: Use GetAllTaskTemplatesResponse_TaskTemplate.ProtoReflect.Descriptor instead.
 func (*GetAllTaskTemplatesResponse_TaskTemplate) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{3, 0}
+	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{13, 0}
 }
 
 func (x *GetAllTaskTemplatesResponse_TaskTemplate) GetId() string {
@@ -1032,7 +861,7 @@ type GetAllTaskTemplatesResponse_TaskTemplate_SubTask struct {
 func (x *GetAllTaskTemplatesResponse_TaskTemplate_SubTask) Reset() {
 	*x = GetAllTaskTemplatesResponse_TaskTemplate_SubTask{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[20]
+		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1045,7 +874,7 @@ func (x *GetAllTaskTemplatesResponse_TaskTemplate_SubTask) String() string {
 func (*GetAllTaskTemplatesResponse_TaskTemplate_SubTask) ProtoMessage() {}
 
 func (x *GetAllTaskTemplatesResponse_TaskTemplate_SubTask) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[20]
+	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1058,7 +887,7 @@ func (x *GetAllTaskTemplatesResponse_TaskTemplate_SubTask) ProtoReflect() protor
 
 // Deprecated: Use GetAllTaskTemplatesResponse_TaskTemplate_SubTask.ProtoReflect.Descriptor instead.
 func (*GetAllTaskTemplatesResponse_TaskTemplate_SubTask) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{3, 0, 0}
+	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{13, 0, 0}
 }
 
 func (x *GetAllTaskTemplatesResponse_TaskTemplate_SubTask) GetId() string {
@@ -1082,299 +911,7 @@ func (x *GetAllTaskTemplatesResponse_TaskTemplate_SubTask) GetName() string {
 	return ""
 }
 
-type GetAllTaskTemplatesByCreatorResponse_TaskTemplate struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id          string                                                       `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Name        string                                                       `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	Description string                                                       `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
-	IsPublic    bool                                                         `protobuf:"varint,4,opt,name=is_public,json=isPublic,proto3" json:"is_public,omitempty"`
-	Subtasks    []*GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask `protobuf:"bytes,7,rep,name=subtasks,proto3" json:"subtasks,omitempty"`
-}
-
-func (x *GetAllTaskTemplatesByCreatorResponse_TaskTemplate) Reset() {
-	*x = GetAllTaskTemplatesByCreatorResponse_TaskTemplate{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[21]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetAllTaskTemplatesByCreatorResponse_TaskTemplate) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetAllTaskTemplatesByCreatorResponse_TaskTemplate) ProtoMessage() {}
-
-func (x *GetAllTaskTemplatesByCreatorResponse_TaskTemplate) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[21]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetAllTaskTemplatesByCreatorResponse_TaskTemplate.ProtoReflect.Descriptor instead.
-func (*GetAllTaskTemplatesByCreatorResponse_TaskTemplate) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{15, 0}
-}
-
-func (x *GetAllTaskTemplatesByCreatorResponse_TaskTemplate) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *GetAllTaskTemplatesByCreatorResponse_TaskTemplate) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *GetAllTaskTemplatesByCreatorResponse_TaskTemplate) GetDescription() string {
-	if x != nil {
-		return x.Description
-	}
-	return ""
-}
-
-func (x *GetAllTaskTemplatesByCreatorResponse_TaskTemplate) GetIsPublic() bool {
-	if x != nil {
-		return x.IsPublic
-	}
-	return false
-}
-
-func (x *GetAllTaskTemplatesByCreatorResponse_TaskTemplate) GetSubtasks() []*GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask {
-	if x != nil {
-		return x.Subtasks
-	}
-	return nil
-}
-
-type GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id             string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	TaskTemplateId string `protobuf:"bytes,2,opt,name=task_template_id,json=taskTemplateId,proto3" json:"task_template_id,omitempty"`
-	Name           string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
-}
-
-func (x *GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask) Reset() {
-	*x = GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[22]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask) ProtoMessage() {}
-
-func (x *GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[22]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask.ProtoReflect.Descriptor instead.
-func (*GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{15, 0, 0}
-}
-
-func (x *GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask) GetTaskTemplateId() string {
-	if x != nil {
-		return x.TaskTemplateId
-	}
-	return ""
-}
-
-func (x *GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-type GetAllTaskTemplatesByWardResponse_TaskTemplate struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id          string                                                    `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Name        string                                                    `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	Description string                                                    `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
-	IsPublic    bool                                                      `protobuf:"varint,4,opt,name=is_public,json=isPublic,proto3" json:"is_public,omitempty"`
-	CreatedBy   string                                                    `protobuf:"bytes,6,opt,name=created_by,json=createdBy,proto3" json:"created_by,omitempty"`
-	Subtasks    []*GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask `protobuf:"bytes,7,rep,name=subtasks,proto3" json:"subtasks,omitempty"`
-}
-
-func (x *GetAllTaskTemplatesByWardResponse_TaskTemplate) Reset() {
-	*x = GetAllTaskTemplatesByWardResponse_TaskTemplate{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[23]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetAllTaskTemplatesByWardResponse_TaskTemplate) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetAllTaskTemplatesByWardResponse_TaskTemplate) ProtoMessage() {}
-
-func (x *GetAllTaskTemplatesByWardResponse_TaskTemplate) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[23]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetAllTaskTemplatesByWardResponse_TaskTemplate.ProtoReflect.Descriptor instead.
-func (*GetAllTaskTemplatesByWardResponse_TaskTemplate) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{17, 0}
-}
-
-func (x *GetAllTaskTemplatesByWardResponse_TaskTemplate) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *GetAllTaskTemplatesByWardResponse_TaskTemplate) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *GetAllTaskTemplatesByWardResponse_TaskTemplate) GetDescription() string {
-	if x != nil {
-		return x.Description
-	}
-	return ""
-}
-
-func (x *GetAllTaskTemplatesByWardResponse_TaskTemplate) GetIsPublic() bool {
-	if x != nil {
-		return x.IsPublic
-	}
-	return false
-}
-
-func (x *GetAllTaskTemplatesByWardResponse_TaskTemplate) GetCreatedBy() string {
-	if x != nil {
-		return x.CreatedBy
-	}
-	return ""
-}
-
-func (x *GetAllTaskTemplatesByWardResponse_TaskTemplate) GetSubtasks() []*GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask {
-	if x != nil {
-		return x.Subtasks
-	}
-	return nil
-}
-
-type GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id             string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	TaskTemplateId string `protobuf:"bytes,2,opt,name=task_template_id,json=taskTemplateId,proto3" json:"task_template_id,omitempty"`
-	Name           string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
-}
-
-func (x *GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask) Reset() {
-	*x = GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[24]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask) ProtoMessage() {}
-
-func (x *GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask) ProtoReflect() protoreflect.Message {
-	mi := &file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[24]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask.ProtoReflect.Descriptor instead.
-func (*GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask) Descriptor() ([]byte, []int) {
-	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP(), []int{17, 0, 0}
-}
-
-func (x *GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask) GetTaskTemplateId() string {
-	if x != nil {
-		return x.TaskTemplateId
-	}
-	return ""
-}
-
-func (x *GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-var File_services_tasks_svc_v1_task_template_svc_proto protoreflect.FileDescriptor
+var File_services_tasks_svc_v1_task_template_svc_proto protoreflect.FileDescriptor
 
 var file_services_tasks_svc_v1_task_template_svc_proto_rawDesc = []byte{
 	0x0a, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x73,
@@ -1400,240 +937,158 @@ var file_services_tasks_svc_v1_task_template_svc_proto_rawDesc = []byte{
 	0x6f, 0x6e, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x69, 0x64, 0x22, 0x2c,
 	0x0a, 0x1a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70,
 	0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x1c, 0x0a, 0x1a,
-	0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61,
-	0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0xcd, 0x03, 0x0a, 0x1b, 0x47,
-	0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74,
-	0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5d, 0x0a, 0x09, 0x74, 0x65,
-	0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3f, 0x2e,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73,
-	0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b,
-	0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x09,
-	0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x1a, 0xce, 0x02, 0x0a, 0x0c, 0x54, 0x61,
-	0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20,
-	0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x12, 0x1d, 0x0a,
-	0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x12, 0x63, 0x0a, 0x08,
-	0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x47,
-	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f,
-	0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73,
-	0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x2e,
-	0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b,
-	0x73, 0x1a, 0x57, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x10,
-	0x74, 0x61, 0x73, 0x6b, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x5f, 0x69, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70,
-	0x6c, 0x61, 0x74, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x2b, 0x0a, 0x19, 0x44, 0x65,
-	0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x1c, 0x0a, 0x1a, 0x44, 0x65, 0x6c, 0x65, 0x74,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x2b, 0x0a, 0x19,
+	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61,
+	0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x1c, 0x0a, 0x1a, 0x44, 0x65, 0x6c,
+	0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x32, 0x0a, 0x20, 0x44, 0x65, 0x6c, 0x65, 0x74,
+	0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62,
+	0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x23, 0x0a, 0x21, 0x44,
+	0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74,
+	0x65, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x84, 0x01, 0x0a, 0x19, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54,
+	0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e,
+	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x17,
+	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72,
+	0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0b,
+	0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x42, 0x07,
+	0x0a, 0x05, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x64, 0x65, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x1c, 0x0a, 0x1a, 0x55, 0x70, 0x64, 0x61, 0x74,
 	0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x32, 0x0a, 0x20, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x63, 0x0a, 0x20, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54,
 	0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x54, 0x61,
-	0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x23, 0x0a, 0x21, 0x44, 0x65, 0x6c,
-	0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53,
-	0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x84,
-	0x01, 0x0a, 0x19, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d,
-	0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x17, 0x0a, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0b, 0x64, 0x65,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05,
-	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x1c, 0x0a, 0x1a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54,
-	0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x63, 0x0a, 0x20, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73,
-	0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x75, 0x62, 0x74, 0x61,
-	0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x75, 0x62,
-	0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42,
-	0x07, 0x0a, 0x05, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x23, 0x0a, 0x21, 0x55, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x75,
-	0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x60, 0x0a,
-	0x20, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c,
-	0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x28, 0x0a, 0x10, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61,
-	0x74, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, 0x73,
-	0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22,
-	0x33, 0x0a, 0x21, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d,
-	0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x02, 0x69, 0x64, 0x22, 0x7d, 0x0a, 0x23, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61,
-	0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x42, 0x79, 0x43, 0x72, 0x65,
-	0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x63,
-	0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x12, 0x26, 0x0a, 0x0c, 0x70, 0x72,
-	0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x6f, 0x6e, 0x6c, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
-	0x48, 0x00, 0x52, 0x0b, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4f, 0x6e, 0x6c, 0x79, 0x88,
-	0x01, 0x01, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x6f,
-	0x6e, 0x6c, 0x79, 0x22, 0xc9, 0x03, 0x0a, 0x24, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61,
-	0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x42, 0x79, 0x43, 0x72, 0x65,
-	0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x66, 0x0a, 0x09,
-	0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x48, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73,
-	0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61,
-	0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x42, 0x79, 0x43, 0x72, 0x65,
-	0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x73,
+	0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x75, 0x62,
+	0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73,
+	0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01,
+	0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x23, 0x0a, 0x21, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65,
+	0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x60, 0x0a, 0x20, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d,
+	0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x10, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x74, 0x65, 0x6d, 0x70,
+	0x6c, 0x61, 0x74, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74,
+	0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a,
+	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x22, 0x33, 0x0a, 0x21, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54,
+	0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x9c, 0x01, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x41, 0x6c,
+	0x6c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x07, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x06, 0x77, 0x61, 0x72, 0x64, 0x49, 0x64,
+	0x88, 0x01, 0x01, 0x12, 0x22, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62,
+	0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74,
+	0x65, 0x64, 0x42, 0x79, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x0c, 0x70, 0x72, 0x69, 0x76, 0x61,
+	0x74, 0x65, 0x5f, 0x6f, 0x6e, 0x6c, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x70,
+	0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4f, 0x6e, 0x6c, 0x79, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x77,
+	0x61, 0x72, 0x64, 0x5f, 0x69, 0x64, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74,
+	0x65, 0x64, 0x5f, 0x62, 0x79, 0x22, 0xcd, 0x03, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c,
+	0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5d, 0x0a, 0x09, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74,
+	0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3f, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31,
+	0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c,
+	0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x73,
 	0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x09, 0x74, 0x65, 0x6d, 0x70, 0x6c,
-	0x61, 0x74, 0x65, 0x73, 0x1a, 0xb8, 0x02, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d,
+	0x61, 0x74, 0x65, 0x73, 0x1a, 0xce, 0x02, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d,
 	0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73,
 	0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
 	0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1b, 0x0a, 0x09, 0x69,
 	0x73, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08,
-	0x69, 0x73, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x12, 0x6c, 0x0a, 0x08, 0x73, 0x75, 0x62, 0x74,
-	0x61, 0x73, 0x6b, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x50, 0x2e, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e,
-	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d,
-	0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x42, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70,
-	0x6c, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x73, 0x75,
-	0x62, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x1a, 0x57, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73,
-	0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
-	0x64, 0x12, 0x28, 0x0a, 0x10, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61,
-	0x74, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, 0x73,
-	0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22,
-	0x3b, 0x0a, 0x20, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d,
-	0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x77, 0x61, 0x72, 0x64, 0x49, 0x64, 0x22, 0xdf, 0x03, 0x0a,
-	0x21, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c,
-	0x61, 0x74, 0x65, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x63, 0x0a, 0x09, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x45, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
-	0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65,
-	0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65,
-	0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e,
-	0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x09, 0x74, 0x65,
-	0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x1a, 0xd4, 0x02, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b,
-	0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b,
-	0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1b,
-	0x0a, 0x09, 0x69, 0x73, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x08, 0x69, 0x73, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x12, 0x1d, 0x0a, 0x0a, 0x63,
-	0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x12, 0x69, 0x0a, 0x08, 0x73, 0x75,
-	0x62, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x4d, 0x2e, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76,
-	0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x54,
-	0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c,
-	0x61, 0x74, 0x65, 0x2e, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x73, 0x75, 0x62,
-	0x74, 0x61, 0x73, 0x6b, 0x73, 0x1a, 0x57, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b,
-	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
-	0x12, 0x28, 0x0a, 0x10, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74,
-	0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, 0x73, 0x6b,
-	0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x32, 0xf4,
-	0x09, 0x0a, 0x13, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7b, 0x0a, 0x12, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
-	0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x30, 0x2e, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76,
-	0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54,
-	0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x31,
-	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f,
-	0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73,
-	0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x12, 0x7e, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73,
-	0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x12, 0x31, 0x2e, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e,
-	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d,
-	0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x32, 0x2e,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73,
-	0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b,
-	0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x12, 0x7b, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73,
-	0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x30, 0x2e, 0x73, 0x65, 0x72, 0x76,
+	0x69, 0x73, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61,
+	0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x12, 0x63, 0x0a, 0x08, 0x73, 0x75, 0x62, 0x74, 0x61,
+	0x73, 0x6b, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x47, 0x2e, 0x73, 0x65, 0x72, 0x76,
 	0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76,
-	0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70,
-	0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x31, 0x2e, 0x73, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
-	0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65,
-	0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
-	0x12, 0x90, 0x01, 0x0a, 0x19, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54,
-	0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x37,
+	0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70,
+	0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x61,
+	0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x75, 0x62, 0x54, 0x61,
+	0x73, 0x6b, 0x52, 0x08, 0x73, 0x75, 0x62, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x1a, 0x57, 0x0a, 0x07,
+	0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x10, 0x74, 0x61, 0x73, 0x6b, 0x5f,
+	0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0e, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x49,
+	0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x32, 0xc5, 0x07, 0x0a, 0x13, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65,
+	0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7b, 0x0a,
+	0x12, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c,
+	0x61, 0x74, 0x65, 0x12, 0x30, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74,
+	0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61,
+	0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
+	0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x7b, 0x0a, 0x12, 0x44, 0x65,
+	0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65,
+	0x12, 0x30, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b,
+	0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54,
+	0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61,
+	0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74,
+	0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x90, 0x01, 0x0a, 0x19, 0x44, 0x65, 0x6c, 0x65,
+	0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x75,
+	0x62, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x37, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
+	0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65,
+	0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65,
+	0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x38,
 	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f,
 	0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73,
 	0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x38, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e,
-	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61,
-	0x74, 0x65, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x12, 0x7b, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73,
-	0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x30, 0x2e, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76,
-	0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70,
-	0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x31, 0x2e, 0x73, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
-	0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65,
-	0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
-	0x12, 0x90, 0x01, 0x0a, 0x19, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54,
-	0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x37,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x7b, 0x0a, 0x12, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65,
+	0x12, 0x30, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b,
+	0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54,
+	0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61,
+	0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x90, 0x01, 0x0a, 0x19, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x75,
+	0x62, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x37, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
+	0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65,
+	0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x38,
 	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f,
 	0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73,
 	0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x38, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61,
-	0x74, 0x65, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x12, 0x90, 0x01, 0x0a, 0x19, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61,
-	0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73,
-	0x6b, 0x12, 0x37, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x90, 0x01, 0x0a, 0x19, 0x43,
+	0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74,
+	0x65, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x37, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31,
+	0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c,
+	0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x38, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73,
 	0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
 	0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x54,
-	0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x38, 0x2e, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e,
-	0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d,
-	0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x99, 0x01, 0x0a, 0x1c, 0x47, 0x65, 0x74, 0x41, 0x6c,
-	0x6c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x42, 0x79,
-	0x43, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x3a, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x7e, 0x0a,
+	0x13, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c,
+	0x61, 0x74, 0x65, 0x73, 0x12, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e,
+	0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
+	0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x32, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
 	0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e,
 	0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61,
-	0x74, 0x65, 0x73, 0x42, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x3b, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74,
-	0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41,
-	0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x42,
-	0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x00, 0x12, 0x90, 0x01, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73,
-	0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64,
-	0x12, 0x37, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b,
-	0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54,
-	0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x42, 0x79, 0x57, 0x61,
-	0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x38, 0x2e, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76,
-	0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70,
-	0x6c, 0x61, 0x74, 0x65, 0x73, 0x42, 0x79, 0x57, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0xc1, 0x01, 0x0a, 0x19, 0x63, 0x6f, 0x6d, 0x2e, 0x73, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63,
-	0x2e, 0x76, 0x31, 0x42, 0x14, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74,
-	0x65, 0x53, 0x76, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x1c, 0x67, 0x65, 0x6e,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f,
-	0x74, 0x61, 0x73, 0x6b, 0x73, 0x2d, 0x73, 0x76, 0x63, 0xa2, 0x02, 0x03, 0x53, 0x54, 0x58, 0xaa,
-	0x02, 0x14, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x73,
-	0x53, 0x76, 0x63, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x14, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x73, 0x5c, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76, 0x63, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x20,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x5c, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76,
-	0x63, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
-	0xea, 0x02, 0x16, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3a, 0x3a, 0x54, 0x61, 0x73,
-	0x6b, 0x73, 0x53, 0x76, 0x63, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0xc1, 0x01,
+	0x0a, 0x19, 0x63, 0x6f, 0x6d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74,
+	0x61, 0x73, 0x6b, 0x73, 0x5f, 0x73, 0x76, 0x63, 0x2e, 0x76, 0x31, 0x42, 0x14, 0x54, 0x61, 0x73,
+	0x6b, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x76, 0x63, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x1c, 0x67, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2d, 0x73, 0x76,
+	0x63, 0xa2, 0x02, 0x03, 0x53, 0x54, 0x58, 0xaa, 0x02, 0x14, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x73, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76, 0x63, 0x2e, 0x56, 0x31, 0xca, 0x02,
+	0x14, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x5c, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53,
+	0x76, 0x63, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
+	0x5c, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76, 0x63, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42,
+	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x16, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x73, 0x3a, 0x3a, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x76, 0x63, 0x3a, 0x3a, 0x56,
+	0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1648,65 +1103,49 @@ func file_services_tasks_svc_v1_task_template_svc_proto_rawDescGZIP() []byte {
 	return file_services_tasks_svc_v1_task_template_svc_proto_rawDescData
 }
 
-var file_services_tasks_svc_v1_task_template_svc_proto_msgTypes = make([]protoimpl.MessageInfo, 25)
+var file_services_tasks_svc_v1_task_template_svc_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
 var file_services_tasks_svc_v1_task_template_svc_proto_goTypes = []interface{}{
-	(*CreateTaskTemplateRequest)(nil),                                 // 0: services.tasks_svc.v1.CreateTaskTemplateRequest
-	(*CreateTaskTemplateResponse)(nil),                                // 1: services.tasks_svc.v1.CreateTaskTemplateResponse
-	(*GetAllTaskTemplatesRequest)(nil),                                // 2: services.tasks_svc.v1.GetAllTaskTemplatesRequest
-	(*GetAllTaskTemplatesResponse)(nil),                               // 3: services.tasks_svc.v1.GetAllTaskTemplatesResponse
-	(*DeleteTaskTemplateRequest)(nil),                                 // 4: services.tasks_svc.v1.DeleteTaskTemplateRequest
-	(*DeleteTaskTemplateResponse)(nil),                                // 5: services.tasks_svc.v1.DeleteTaskTemplateResponse
-	(*DeleteTaskTemplateSubTaskRequest)(nil),                          // 6: services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest
-	(*DeleteTaskTemplateSubTaskResponse)(nil),                         // 7: services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse
-	(*UpdateTaskTemplateRequest)(nil),                                 // 8: services.tasks_svc.v1.UpdateTaskTemplateRequest
-	(*UpdateTaskTemplateResponse)(nil),                                // 9: services.tasks_svc.v1.UpdateTaskTemplateResponse
-	(*UpdateTaskTemplateSubTaskRequest)(nil),                          // 10: services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest
-	(*UpdateTaskTemplateSubTaskResponse)(nil),                         // 11: services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse
-	(*CreateTaskTemplateSubTaskRequest)(nil),                          // 12: services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest
-	(*CreateTaskTemplateSubTaskResponse)(nil),                         // 13: services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse
-	(*GetAllTaskTemplatesByCreatorRequest)(nil),                       // 14: services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest
-	(*GetAllTaskTemplatesByCreatorResponse)(nil),                      // 15: services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse
-	(*GetAllTaskTemplatesByWardRequest)(nil),                          // 16: services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest
-	(*GetAllTaskTemplatesByWardResponse)(nil),                         // 17: services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse
-	(*CreateTaskTemplateRequest_SubTask)(nil),                         // 18: services.tasks_svc.v1.CreateTaskTemplateRequest.SubTask
-	(*GetAllTaskTemplatesResponse_TaskTemplate)(nil),                  // 19: services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate
-	(*GetAllTaskTemplatesResponse_TaskTemplate_SubTask)(nil),          // 20: services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask
-	(*GetAllTaskTemplatesByCreatorResponse_TaskTemplate)(nil),         // 21: services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate
-	(*GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask)(nil), // 22: services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask
-	(*GetAllTaskTemplatesByWardResponse_TaskTemplate)(nil),            // 23: services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate
-	(*GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask)(nil),    // 24: services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask
+	(*CreateTaskTemplateRequest)(nil),                        // 0: services.tasks_svc.v1.CreateTaskTemplateRequest
+	(*CreateTaskTemplateResponse)(nil),                       // 1: services.tasks_svc.v1.CreateTaskTemplateResponse
+	(*DeleteTaskTemplateRequest)(nil),                        // 2: services.tasks_svc.v1.DeleteTaskTemplateRequest
+	(*DeleteTaskTemplateResponse)(nil),                       // 3: services.tasks_svc.v1.DeleteTaskTemplateResponse
+	(*DeleteTaskTemplateSubTaskRequest)(nil),                 // 4: services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest
+	(*DeleteTaskTemplateSubTaskResponse)(nil),                // 5: services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse
+	(*UpdateTaskTemplateRequest)(nil),                        // 6: services.tasks_svc.v1.UpdateTaskTemplateRequest
+	(*UpdateTaskTemplateResponse)(nil),                       // 7: services.tasks_svc.v1.UpdateTaskTemplateResponse
+	(*UpdateTaskTemplateSubTaskRequest)(nil),                 // 8: services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest
+	(*UpdateTaskTemplateSubTaskResponse)(nil),                // 9: services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse
+	(*CreateTaskTemplateSubTaskRequest)(nil),                 // 10: services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest
+	(*CreateTaskTemplateSubTaskResponse)(nil),                // 11: services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse
+	(*GetAllTaskTemplatesRequest)(nil),                       // 12: services.tasks_svc.v1.GetAllTaskTemplatesRequest
+	(*GetAllTaskTemplatesResponse)(nil),                      // 13: services.tasks_svc.v1.GetAllTaskTemplatesResponse
+	(*CreateTaskTemplateRequest_SubTask)(nil),                // 14: services.tasks_svc.v1.CreateTaskTemplateRequest.SubTask
+	(*GetAllTaskTemplatesResponse_TaskTemplate)(nil),         // 15: services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate
+	(*GetAllTaskTemplatesResponse_TaskTemplate_SubTask)(nil), // 16: services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask
 }
 var file_services_tasks_svc_v1_task_template_svc_proto_depIdxs = []int32{
-	18, // 0: services.tasks_svc.v1.CreateTaskTemplateRequest.subtasks:type_name -> services.tasks_svc.v1.CreateTaskTemplateRequest.SubTask
-	19, // 1: services.tasks_svc.v1.GetAllTaskTemplatesResponse.templates:type_name -> services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate
-	21, // 2: services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.templates:type_name -> services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate
-	23, // 3: services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.templates:type_name -> services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate
-	20, // 4: services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.subtasks:type_name -> services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask
-	22, // 5: services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.subtasks:type_name -> services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask
-	24, // 6: services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.subtasks:type_name -> services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask
-	0,  // 7: services.tasks_svc.v1.TaskTemplateService.CreateTaskTemplate:input_type -> services.tasks_svc.v1.CreateTaskTemplateRequest
-	2,  // 8: services.tasks_svc.v1.TaskTemplateService.GetAllTaskTemplates:input_type -> services.tasks_svc.v1.GetAllTaskTemplatesRequest
-	4,  // 9: services.tasks_svc.v1.TaskTemplateService.DeleteTaskTemplate:input_type -> services.tasks_svc.v1.DeleteTaskTemplateRequest
-	6,  // 10: services.tasks_svc.v1.TaskTemplateService.DeleteTaskTemplateSubTask:input_type -> services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest
-	8,  // 11: services.tasks_svc.v1.TaskTemplateService.UpdateTaskTemplate:input_type -> services.tasks_svc.v1.UpdateTaskTemplateRequest
-	10, // 12: services.tasks_svc.v1.TaskTemplateService.UpdateTaskTemplateSubTask:input_type -> services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest
-	12, // 13: services.tasks_svc.v1.TaskTemplateService.CreateTaskTemplateSubTask:input_type -> services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest
-	14, // 14: services.tasks_svc.v1.TaskTemplateService.GetAllTaskTemplatesByCreator:input_type -> services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest
-	16, // 15: services.tasks_svc.v1.TaskTemplateService.GetAllTaskTemplatesByWard:input_type -> services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest
-	1,  // 16: services.tasks_svc.v1.TaskTemplateService.CreateTaskTemplate:output_type -> services.tasks_svc.v1.CreateTaskTemplateResponse
-	3,  // 17: services.tasks_svc.v1.TaskTemplateService.GetAllTaskTemplates:output_type -> services.tasks_svc.v1.GetAllTaskTemplatesResponse
-	5,  // 18: services.tasks_svc.v1.TaskTemplateService.DeleteTaskTemplate:output_type -> services.tasks_svc.v1.DeleteTaskTemplateResponse
-	7,  // 19: services.tasks_svc.v1.TaskTemplateService.DeleteTaskTemplateSubTask:output_type -> services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse
-	9,  // 20: services.tasks_svc.v1.TaskTemplateService.UpdateTaskTemplate:output_type -> services.tasks_svc.v1.UpdateTaskTemplateResponse
-	11, // 21: services.tasks_svc.v1.TaskTemplateService.UpdateTaskTemplateSubTask:output_type -> services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse
-	13, // 22: services.tasks_svc.v1.TaskTemplateService.CreateTaskTemplateSubTask:output_type -> services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse
-	15, // 23: services.tasks_svc.v1.TaskTemplateService.GetAllTaskTemplatesByCreator:output_type -> services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse
-	17, // 24: services.tasks_svc.v1.TaskTemplateService.GetAllTaskTemplatesByWard:output_type -> services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse
-	16, // [16:25] is the sub-list for method output_type
-	7,  // [7:16] is the sub-list for method input_type
-	7,  // [7:7] is the sub-list for extension type_name
-	7,  // [7:7] is the sub-list for extension extendee
-	0,  // [0:7] is the sub-list for field type_name
+	14, // 0: services.tasks_svc.v1.CreateTaskTemplateRequest.subtasks:type_name -> services.tasks_svc.v1.CreateTaskTemplateRequest.SubTask
+	15, // 1: services.tasks_svc.v1.GetAllTaskTemplatesResponse.templates:type_name -> services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate
+	16, // 2: services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.subtasks:type_name -> services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask
+	0,  // 3: services.tasks_svc.v1.TaskTemplateService.CreateTaskTemplate:input_type -> services.tasks_svc.v1.CreateTaskTemplateRequest
+	2,  // 4: services.tasks_svc.v1.TaskTemplateService.DeleteTaskTemplate:input_type -> services.tasks_svc.v1.DeleteTaskTemplateRequest
+	4,  // 5: services.tasks_svc.v1.TaskTemplateService.DeleteTaskTemplateSubTask:input_type -> services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest
+	6,  // 6: services.tasks_svc.v1.TaskTemplateService.UpdateTaskTemplate:input_type -> services.tasks_svc.v1.UpdateTaskTemplateRequest
+	8,  // 7: services.tasks_svc.v1.TaskTemplateService.UpdateTaskTemplateSubTask:input_type -> services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest
+	10, // 8: services.tasks_svc.v1.TaskTemplateService.CreateTaskTemplateSubTask:input_type -> services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest
+	12, // 9: services.tasks_svc.v1.TaskTemplateService.GetAllTaskTemplates:input_type -> services.tasks_svc.v1.GetAllTaskTemplatesRequest
+	1,  // 10: services.tasks_svc.v1.TaskTemplateService.CreateTaskTemplate:output_type -> services.tasks_svc.v1.CreateTaskTemplateResponse
+	3,  // 11: services.tasks_svc.v1.TaskTemplateService.DeleteTaskTemplate:output_type -> services.tasks_svc.v1.DeleteTaskTemplateResponse
+	5,  // 12: services.tasks_svc.v1.TaskTemplateService.DeleteTaskTemplateSubTask:output_type -> services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse
+	7,  // 13: services.tasks_svc.v1.TaskTemplateService.UpdateTaskTemplate:output_type -> services.tasks_svc.v1.UpdateTaskTemplateResponse
+	9,  // 14: services.tasks_svc.v1.TaskTemplateService.UpdateTaskTemplateSubTask:output_type -> services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse
+	11, // 15: services.tasks_svc.v1.TaskTemplateService.CreateTaskTemplateSubTask:output_type -> services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse
+	13, // 16: services.tasks_svc.v1.TaskTemplateService.GetAllTaskTemplates:output_type -> services.tasks_svc.v1.GetAllTaskTemplatesResponse
+	10, // [10:17] is the sub-list for method output_type
+	3,  // [3:10] is the sub-list for method input_type
+	3,  // [3:3] is the sub-list for extension type_name
+	3,  // [3:3] is the sub-list for extension extendee
+	0,  // [0:3] is the sub-list for field type_name
 }
 
 func init() { file_services_tasks_svc_v1_task_template_svc_proto_init() }
@@ -1740,7 +1179,7 @@ func file_services_tasks_svc_v1_task_template_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetAllTaskTemplatesRequest); i {
+			switch v := v.(*DeleteTaskTemplateRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1752,7 +1191,7 @@ func file_services_tasks_svc_v1_task_template_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetAllTaskTemplatesResponse); i {
+			switch v := v.(*DeleteTaskTemplateResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1764,7 +1203,7 @@ func file_services_tasks_svc_v1_task_template_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DeleteTaskTemplateRequest); i {
+			switch v := v.(*DeleteTaskTemplateSubTaskRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1776,7 +1215,7 @@ func file_services_tasks_svc_v1_task_template_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DeleteTaskTemplateResponse); i {
+			switch v := v.(*DeleteTaskTemplateSubTaskResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1788,7 +1227,7 @@ func file_services_tasks_svc_v1_task_template_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DeleteTaskTemplateSubTaskRequest); i {
+			switch v := v.(*UpdateTaskTemplateRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1800,7 +1239,7 @@ func file_services_tasks_svc_v1_task_template_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DeleteTaskTemplateSubTaskResponse); i {
+			switch v := v.(*UpdateTaskTemplateResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1812,7 +1251,7 @@ func file_services_tasks_svc_v1_task_template_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UpdateTaskTemplateRequest); i {
+			switch v := v.(*UpdateTaskTemplateSubTaskRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1824,7 +1263,7 @@ func file_services_tasks_svc_v1_task_template_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UpdateTaskTemplateResponse); i {
+			switch v := v.(*UpdateTaskTemplateSubTaskResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1836,7 +1275,7 @@ func file_services_tasks_svc_v1_task_template_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UpdateTaskTemplateSubTaskRequest); i {
+			switch v := v.(*CreateTaskTemplateSubTaskRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1848,7 +1287,7 @@ func file_services_tasks_svc_v1_task_template_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UpdateTaskTemplateSubTaskResponse); i {
+			switch v := v.(*CreateTaskTemplateSubTaskResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1860,7 +1299,7 @@ func file_services_tasks_svc_v1_task_template_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CreateTaskTemplateSubTaskRequest); i {
+			switch v := v.(*GetAllTaskTemplatesRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1872,7 +1311,7 @@ func file_services_tasks_svc_v1_task_template_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CreateTaskTemplateSubTaskResponse); i {
+			switch v := v.(*GetAllTaskTemplatesResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1884,54 +1323,6 @@ func file_services_tasks_svc_v1_task_template_svc_proto_init() {
 			}
 		}
 		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetAllTaskTemplatesByCreatorRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetAllTaskTemplatesByCreatorResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetAllTaskTemplatesByWardRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetAllTaskTemplatesByWardResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CreateTaskTemplateRequest_SubTask); i {
 			case 0:
 				return &v.state
@@ -1943,7 +1334,7 @@ func file_services_tasks_svc_v1_task_template_svc_proto_init() {
 				return nil
 			}
 		}
-		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetAllTaskTemplatesResponse_TaskTemplate); i {
 			case 0:
 				return &v.state
@@ -1955,7 +1346,7 @@ func file_services_tasks_svc_v1_task_template_svc_proto_init() {
 				return nil
 			}
 		}
-		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetAllTaskTemplatesResponse_TaskTemplate_SubTask); i {
 			case 0:
 				return &v.state
@@ -1967,66 +1358,18 @@ func file_services_tasks_svc_v1_task_template_svc_proto_init() {
 				return nil
 			}
 		}
-		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetAllTaskTemplatesByCreatorResponse_TaskTemplate); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetAllTaskTemplatesByWardResponse_TaskTemplate); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
 	}
 	file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[0].OneofWrappers = []interface{}{}
+	file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[6].OneofWrappers = []interface{}{}
 	file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[8].OneofWrappers = []interface{}{}
-	file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[10].OneofWrappers = []interface{}{}
-	file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[14].OneofWrappers = []interface{}{}
+	file_services_tasks_svc_v1_task_template_svc_proto_msgTypes[12].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_services_tasks_svc_v1_task_template_svc_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   25,
+			NumMessages:   17,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/gen/go/services/tasks_svc/v1/task_template_svc_grpc.pb.go b/gen/go/services/tasks_svc/v1/task_template_svc_grpc.pb.go
index 142d99d59..f8ed0cdfb 100644
--- a/gen/go/services/tasks_svc/v1/task_template_svc_grpc.pb.go
+++ b/gen/go/services/tasks_svc/v1/task_template_svc_grpc.pb.go
@@ -19,15 +19,13 @@ import (
 const _ = grpc.SupportPackageIsVersion8
 
 const (
-	TaskTemplateService_CreateTaskTemplate_FullMethodName           = "/services.tasks_svc.v1.TaskTemplateService/CreateTaskTemplate"
-	TaskTemplateService_GetAllTaskTemplates_FullMethodName          = "/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplates"
-	TaskTemplateService_DeleteTaskTemplate_FullMethodName           = "/services.tasks_svc.v1.TaskTemplateService/DeleteTaskTemplate"
-	TaskTemplateService_DeleteTaskTemplateSubTask_FullMethodName    = "/services.tasks_svc.v1.TaskTemplateService/DeleteTaskTemplateSubTask"
-	TaskTemplateService_UpdateTaskTemplate_FullMethodName           = "/services.tasks_svc.v1.TaskTemplateService/UpdateTaskTemplate"
-	TaskTemplateService_UpdateTaskTemplateSubTask_FullMethodName    = "/services.tasks_svc.v1.TaskTemplateService/UpdateTaskTemplateSubTask"
-	TaskTemplateService_CreateTaskTemplateSubTask_FullMethodName    = "/services.tasks_svc.v1.TaskTemplateService/CreateTaskTemplateSubTask"
-	TaskTemplateService_GetAllTaskTemplatesByCreator_FullMethodName = "/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplatesByCreator"
-	TaskTemplateService_GetAllTaskTemplatesByWard_FullMethodName    = "/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplatesByWard"
+	TaskTemplateService_CreateTaskTemplate_FullMethodName        = "/services.tasks_svc.v1.TaskTemplateService/CreateTaskTemplate"
+	TaskTemplateService_DeleteTaskTemplate_FullMethodName        = "/services.tasks_svc.v1.TaskTemplateService/DeleteTaskTemplate"
+	TaskTemplateService_DeleteTaskTemplateSubTask_FullMethodName = "/services.tasks_svc.v1.TaskTemplateService/DeleteTaskTemplateSubTask"
+	TaskTemplateService_UpdateTaskTemplate_FullMethodName        = "/services.tasks_svc.v1.TaskTemplateService/UpdateTaskTemplate"
+	TaskTemplateService_UpdateTaskTemplateSubTask_FullMethodName = "/services.tasks_svc.v1.TaskTemplateService/UpdateTaskTemplateSubTask"
+	TaskTemplateService_CreateTaskTemplateSubTask_FullMethodName = "/services.tasks_svc.v1.TaskTemplateService/CreateTaskTemplateSubTask"
+	TaskTemplateService_GetAllTaskTemplates_FullMethodName       = "/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplates"
 )
 
 // TaskTemplateServiceClient is the client API for TaskTemplateService service.
@@ -35,14 +33,12 @@ const (
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type TaskTemplateServiceClient interface {
 	CreateTaskTemplate(ctx context.Context, in *CreateTaskTemplateRequest, opts ...grpc.CallOption) (*CreateTaskTemplateResponse, error)
-	GetAllTaskTemplates(ctx context.Context, in *GetAllTaskTemplatesRequest, opts ...grpc.CallOption) (*GetAllTaskTemplatesResponse, error)
 	DeleteTaskTemplate(ctx context.Context, in *DeleteTaskTemplateRequest, opts ...grpc.CallOption) (*DeleteTaskTemplateResponse, error)
 	DeleteTaskTemplateSubTask(ctx context.Context, in *DeleteTaskTemplateSubTaskRequest, opts ...grpc.CallOption) (*DeleteTaskTemplateSubTaskResponse, error)
 	UpdateTaskTemplate(ctx context.Context, in *UpdateTaskTemplateRequest, opts ...grpc.CallOption) (*UpdateTaskTemplateResponse, error)
 	UpdateTaskTemplateSubTask(ctx context.Context, in *UpdateTaskTemplateSubTaskRequest, opts ...grpc.CallOption) (*UpdateTaskTemplateSubTaskResponse, error)
 	CreateTaskTemplateSubTask(ctx context.Context, in *CreateTaskTemplateSubTaskRequest, opts ...grpc.CallOption) (*CreateTaskTemplateSubTaskResponse, error)
-	GetAllTaskTemplatesByCreator(ctx context.Context, in *GetAllTaskTemplatesByCreatorRequest, opts ...grpc.CallOption) (*GetAllTaskTemplatesByCreatorResponse, error)
-	GetAllTaskTemplatesByWard(ctx context.Context, in *GetAllTaskTemplatesByWardRequest, opts ...grpc.CallOption) (*GetAllTaskTemplatesByWardResponse, error)
+	GetAllTaskTemplates(ctx context.Context, in *GetAllTaskTemplatesRequest, opts ...grpc.CallOption) (*GetAllTaskTemplatesResponse, error)
 }
 
 type taskTemplateServiceClient struct {
@@ -63,16 +59,6 @@ func (c *taskTemplateServiceClient) CreateTaskTemplate(ctx context.Context, in *
 	return out, nil
 }
 
-func (c *taskTemplateServiceClient) GetAllTaskTemplates(ctx context.Context, in *GetAllTaskTemplatesRequest, opts ...grpc.CallOption) (*GetAllTaskTemplatesResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(GetAllTaskTemplatesResponse)
-	err := c.cc.Invoke(ctx, TaskTemplateService_GetAllTaskTemplates_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *taskTemplateServiceClient) DeleteTaskTemplate(ctx context.Context, in *DeleteTaskTemplateRequest, opts ...grpc.CallOption) (*DeleteTaskTemplateResponse, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(DeleteTaskTemplateResponse)
@@ -123,20 +109,10 @@ func (c *taskTemplateServiceClient) CreateTaskTemplateSubTask(ctx context.Contex
 	return out, nil
 }
 
-func (c *taskTemplateServiceClient) GetAllTaskTemplatesByCreator(ctx context.Context, in *GetAllTaskTemplatesByCreatorRequest, opts ...grpc.CallOption) (*GetAllTaskTemplatesByCreatorResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(GetAllTaskTemplatesByCreatorResponse)
-	err := c.cc.Invoke(ctx, TaskTemplateService_GetAllTaskTemplatesByCreator_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *taskTemplateServiceClient) GetAllTaskTemplatesByWard(ctx context.Context, in *GetAllTaskTemplatesByWardRequest, opts ...grpc.CallOption) (*GetAllTaskTemplatesByWardResponse, error) {
+func (c *taskTemplateServiceClient) GetAllTaskTemplates(ctx context.Context, in *GetAllTaskTemplatesRequest, opts ...grpc.CallOption) (*GetAllTaskTemplatesResponse, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(GetAllTaskTemplatesByWardResponse)
-	err := c.cc.Invoke(ctx, TaskTemplateService_GetAllTaskTemplatesByWard_FullMethodName, in, out, cOpts...)
+	out := new(GetAllTaskTemplatesResponse)
+	err := c.cc.Invoke(ctx, TaskTemplateService_GetAllTaskTemplates_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -148,14 +124,12 @@ func (c *taskTemplateServiceClient) GetAllTaskTemplatesByWard(ctx context.Contex
 // for forward compatibility
 type TaskTemplateServiceServer interface {
 	CreateTaskTemplate(context.Context, *CreateTaskTemplateRequest) (*CreateTaskTemplateResponse, error)
-	GetAllTaskTemplates(context.Context, *GetAllTaskTemplatesRequest) (*GetAllTaskTemplatesResponse, error)
 	DeleteTaskTemplate(context.Context, *DeleteTaskTemplateRequest) (*DeleteTaskTemplateResponse, error)
 	DeleteTaskTemplateSubTask(context.Context, *DeleteTaskTemplateSubTaskRequest) (*DeleteTaskTemplateSubTaskResponse, error)
 	UpdateTaskTemplate(context.Context, *UpdateTaskTemplateRequest) (*UpdateTaskTemplateResponse, error)
 	UpdateTaskTemplateSubTask(context.Context, *UpdateTaskTemplateSubTaskRequest) (*UpdateTaskTemplateSubTaskResponse, error)
 	CreateTaskTemplateSubTask(context.Context, *CreateTaskTemplateSubTaskRequest) (*CreateTaskTemplateSubTaskResponse, error)
-	GetAllTaskTemplatesByCreator(context.Context, *GetAllTaskTemplatesByCreatorRequest) (*GetAllTaskTemplatesByCreatorResponse, error)
-	GetAllTaskTemplatesByWard(context.Context, *GetAllTaskTemplatesByWardRequest) (*GetAllTaskTemplatesByWardResponse, error)
+	GetAllTaskTemplates(context.Context, *GetAllTaskTemplatesRequest) (*GetAllTaskTemplatesResponse, error)
 	mustEmbedUnimplementedTaskTemplateServiceServer()
 }
 
@@ -166,9 +140,6 @@ type UnimplementedTaskTemplateServiceServer struct {
 func (UnimplementedTaskTemplateServiceServer) CreateTaskTemplate(context.Context, *CreateTaskTemplateRequest) (*CreateTaskTemplateResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateTaskTemplate not implemented")
 }
-func (UnimplementedTaskTemplateServiceServer) GetAllTaskTemplates(context.Context, *GetAllTaskTemplatesRequest) (*GetAllTaskTemplatesResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetAllTaskTemplates not implemented")
-}
 func (UnimplementedTaskTemplateServiceServer) DeleteTaskTemplate(context.Context, *DeleteTaskTemplateRequest) (*DeleteTaskTemplateResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteTaskTemplate not implemented")
 }
@@ -184,11 +155,8 @@ func (UnimplementedTaskTemplateServiceServer) UpdateTaskTemplateSubTask(context.
 func (UnimplementedTaskTemplateServiceServer) CreateTaskTemplateSubTask(context.Context, *CreateTaskTemplateSubTaskRequest) (*CreateTaskTemplateSubTaskResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateTaskTemplateSubTask not implemented")
 }
-func (UnimplementedTaskTemplateServiceServer) GetAllTaskTemplatesByCreator(context.Context, *GetAllTaskTemplatesByCreatorRequest) (*GetAllTaskTemplatesByCreatorResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetAllTaskTemplatesByCreator not implemented")
-}
-func (UnimplementedTaskTemplateServiceServer) GetAllTaskTemplatesByWard(context.Context, *GetAllTaskTemplatesByWardRequest) (*GetAllTaskTemplatesByWardResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetAllTaskTemplatesByWard not implemented")
+func (UnimplementedTaskTemplateServiceServer) GetAllTaskTemplates(context.Context, *GetAllTaskTemplatesRequest) (*GetAllTaskTemplatesResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetAllTaskTemplates not implemented")
 }
 func (UnimplementedTaskTemplateServiceServer) mustEmbedUnimplementedTaskTemplateServiceServer() {}
 
@@ -221,24 +189,6 @@ func _TaskTemplateService_CreateTaskTemplate_Handler(srv interface{}, ctx contex
 	return interceptor(ctx, in, info, handler)
 }
 
-func _TaskTemplateService_GetAllTaskTemplates_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetAllTaskTemplatesRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TaskTemplateServiceServer).GetAllTaskTemplates(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: TaskTemplateService_GetAllTaskTemplates_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TaskTemplateServiceServer).GetAllTaskTemplates(ctx, req.(*GetAllTaskTemplatesRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _TaskTemplateService_DeleteTaskTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(DeleteTaskTemplateRequest)
 	if err := dec(in); err != nil {
@@ -329,38 +279,20 @@ func _TaskTemplateService_CreateTaskTemplateSubTask_Handler(srv interface{}, ctx
 	return interceptor(ctx, in, info, handler)
 }
 
-func _TaskTemplateService_GetAllTaskTemplatesByCreator_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetAllTaskTemplatesByCreatorRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TaskTemplateServiceServer).GetAllTaskTemplatesByCreator(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: TaskTemplateService_GetAllTaskTemplatesByCreator_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TaskTemplateServiceServer).GetAllTaskTemplatesByCreator(ctx, req.(*GetAllTaskTemplatesByCreatorRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _TaskTemplateService_GetAllTaskTemplatesByWard_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetAllTaskTemplatesByWardRequest)
+func _TaskTemplateService_GetAllTaskTemplates_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetAllTaskTemplatesRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(TaskTemplateServiceServer).GetAllTaskTemplatesByWard(ctx, in)
+		return srv.(TaskTemplateServiceServer).GetAllTaskTemplates(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: TaskTemplateService_GetAllTaskTemplatesByWard_FullMethodName,
+		FullMethod: TaskTemplateService_GetAllTaskTemplates_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TaskTemplateServiceServer).GetAllTaskTemplatesByWard(ctx, req.(*GetAllTaskTemplatesByWardRequest))
+		return srv.(TaskTemplateServiceServer).GetAllTaskTemplates(ctx, req.(*GetAllTaskTemplatesRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -376,10 +308,6 @@ var TaskTemplateService_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "CreateTaskTemplate",
 			Handler:    _TaskTemplateService_CreateTaskTemplate_Handler,
 		},
-		{
-			MethodName: "GetAllTaskTemplates",
-			Handler:    _TaskTemplateService_GetAllTaskTemplates_Handler,
-		},
 		{
 			MethodName: "DeleteTaskTemplate",
 			Handler:    _TaskTemplateService_DeleteTaskTemplate_Handler,
@@ -401,12 +329,8 @@ var TaskTemplateService_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _TaskTemplateService_CreateTaskTemplateSubTask_Handler,
 		},
 		{
-			MethodName: "GetAllTaskTemplatesByCreator",
-			Handler:    _TaskTemplateService_GetAllTaskTemplatesByCreator_Handler,
-		},
-		{
-			MethodName: "GetAllTaskTemplatesByWard",
-			Handler:    _TaskTemplateService_GetAllTaskTemplatesByWard_Handler,
+			MethodName: "GetAllTaskTemplates",
+			Handler:    _TaskTemplateService_GetAllTaskTemplates_Handler,
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
diff --git a/gen/python/services/tasks_svc/v1/patient_svc_pb2.py b/gen/python/services/tasks_svc/v1/patient_svc_pb2.py
index 9267a01d8..ed8543715 100644
--- a/gen/python/services/tasks_svc/v1/patient_svc_pb2.py
+++ b/gen/python/services/tasks_svc/v1/patient_svc_pb2.py
@@ -15,7 +15,7 @@
 from services.tasks_svc.v1 import types_pb2 as services_dot_tasks__svc_dot_v1_dot_types__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\'services/tasks_svc/v1/patient_svc.proto\x12\x15services.tasks_svc.v1\x1a!services/tasks_svc/v1/types.proto\"w\n\x14\x43reatePatientRequest\x12:\n\x19human_readable_identifier\x18\x01 \x01(\tR\x17humanReadableIdentifier\x12\x19\n\x05notes\x18\x02 \x01(\tH\x00R\x05notes\x88\x01\x01\x42\x08\n\x06_notes\"\'\n\x15\x43reatePatientResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"#\n\x11GetPatientRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xd7\x03\n\x12GetPatientResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x14\n\x05notes\x18\x03 \x01(\tR\x05notes\x12\x1a\n\x06\x62\x65\x64_id\x18\x04 \x01(\tH\x00R\x05\x62\x65\x64Id\x88\x01\x01\x12\x1c\n\x07ward_id\x18\x05 \x01(\tH\x01R\x06wardId\x88\x01\x01\x12G\n\x04room\x18\x07 \x01(\x0b\x32..services.tasks_svc.v1.GetPatientResponse.RoomH\x02R\x04room\x88\x01\x01\x12\x44\n\x03\x62\x65\x64\x18\x08 \x01(\x0b\x32-.services.tasks_svc.v1.GetPatientResponse.BedH\x03R\x03\x62\x65\x64\x88\x01\x01\x1a\x43\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x03 \x01(\tR\x06wardId\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04nameB\t\n\x07_bed_idB\n\n\x08_ward_idB\x07\n\x05_roomB\x06\n\x04_bed\"/\n\x16GetPatientByBedRequest\x12\x15\n\x06\x62\x65\x64_id\x18\x01 \x01(\tR\x05\x62\x65\x64Id\"\xa2\x01\n\x17GetPatientByBedResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x14\n\x05notes\x18\x03 \x01(\tR\x05notes\x12\x1a\n\x06\x62\x65\x64_id\x18\x04 \x01(\tH\x00R\x05\x62\x65\x64Id\x88\x01\x01\x42\t\n\x07_bed_id\"3\n\x18GetPatientsByWardRequest\x12\x17\n\x07ward_id\x18\x01 \x01(\tR\x06wardId\"\x86\x02\n\x19GetPatientsByWardResponse\x12T\n\x08patients\x18\x01 \x03(\x0b\x32\x38.services.tasks_svc.v1.GetPatientsByWardResponse.PatientR\x08patients\x1a\x92\x01\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x14\n\x05notes\x18\x03 \x01(\tR\x05notes\x12\x1a\n\x06\x62\x65\x64_id\x18\x04 \x01(\tH\x00R\x05\x62\x65\x64Id\x88\x01\x01\x42\t\n\x07_bed_id\"<\n!GetPatientAssignmentByWardRequest\x12\x17\n\x07ward_id\x18\x01 \x01(\tR\x06wardId\"\xd1\x03\n\"GetPatientAssignmentByWardResponse\x12T\n\x05rooms\x18\x01 \x03(\x0b\x32>.services.tasks_svc.v1.GetPatientAssignmentByWardResponse.RoomR\x05rooms\x1a\xd4\x02\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12V\n\x04\x62\x65\x64s\x18\x03 \x03(\x0b\x32\x42.services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.BedR\x04\x62\x65\x64s\x1a\xcf\x01\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12i\n\x07patient\x18\x03 \x01(\x0b\x32J.services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.Bed.PatientH\x00R\x07patient\x88\x01\x01\x1a-\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04nameB\n\n\x08_patient\"*\n\x18GetPatientDetailsRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xb0\x07\n\x19GetPatientDetailsResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x14\n\x05notes\x18\x03 \x01(\tR\x05notes\x12K\n\x05tasks\x18\x04 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetPatientDetailsResponse.TaskR\x05tasks\x12N\n\x04room\x18\x05 \x01(\x0b\x32\x35.services.tasks_svc.v1.GetPatientDetailsResponse.RoomH\x00R\x04room\x88\x01\x01\x12K\n\x03\x62\x65\x64\x18\x06 \x01(\x0b\x32\x34.services.tasks_svc.v1.GetPatientDetailsResponse.BedH\x01R\x03\x62\x65\x64\x88\x01\x01\x12#\n\ris_discharged\x18\x07 \x01(\x08R\x0cisDischarged\x1a\x43\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x03 \x01(\tR\x06wardId\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x1a\xa0\x03\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x39\n\x06status\x18\x04 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12-\n\x10\x61ssigned_user_id\x18\x05 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12\x1d\n\npatient_id\x18\x06 \x01(\tR\tpatientId\x12\x16\n\x06public\x18\x07 \x01(\x08R\x06public\x12Y\n\x08subtasks\x18\x08 \x03(\x0b\x32=.services.tasks_svc.v1.GetPatientDetailsResponse.Task.SubTaskR\x08subtasks\x1a\x41\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64oneB\x13\n\x11_assigned_user_idB\x07\n\x05_roomB\x06\n\x04_bed\"A\n\x15GetPatientListRequest\x12\x1c\n\x07ward_id\x18\x01 \x01(\tH\x00R\x06wardId\x88\x01\x01\x42\n\n\x08_ward_id\"\x8c\t\n\x16GetPatientListResponse\x12M\n\x06\x61\x63tive\x18\x01 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetPatientListResponse.PatientR\x06\x61\x63tive\x12\x66\n\x13unassigned_patients\x18\x02 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetPatientListResponse.PatientR\x12unassignedPatients\x12\x66\n\x13\x64ischarged_patients\x18\x03 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetPatientListResponse.PatientR\x12\x64ischargedPatients\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x1a\x43\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x03 \x01(\tR\x06wardId\x1a\xc2\x02\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x46\n\x04room\x18\x03 \x01(\x0b\x32\x32.services.tasks_svc.v1.GetPatientListResponse.RoomR\x04room\x12\x43\n\x03\x62\x65\x64\x18\x04 \x01(\x0b\x32\x31.services.tasks_svc.v1.GetPatientListResponse.BedR\x03\x62\x65\x64\x12\x14\n\x05notes\x18\x05 \x01(\tR\x05notes\x12H\n\x05tasks\x18\x06 \x03(\x0b\x32\x32.services.tasks_svc.v1.GetPatientListResponse.TaskR\x05tasks\x1a\x9d\x03\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x39\n\x06status\x18\x04 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12-\n\x10\x61ssigned_user_id\x18\x05 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12\x1d\n\npatient_id\x18\x06 \x01(\tR\tpatientId\x12\x16\n\x06public\x18\x07 \x01(\x08R\x06public\x12V\n\x08subtasks\x18\x08 \x03(\x0b\x32:.services.tasks_svc.v1.GetPatientListResponse.Task.SubTaskR\x08subtasks\x1a\x41\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64oneB\x13\n\x11_assigned_user_id\"\x1a\n\x18GetRecentPatientsRequest\"\xf5\x03\n\x19GetRecentPatientsResponse\x12o\n\x0frecent_patients\x18\x01 \x03(\x0b\x32\x46.services.tasks_svc.v1.GetRecentPatientsResponse.PatientWithRoomAndBedR\x0erecentPatients\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x1a\x43\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x03 \x01(\tR\x06wardId\x1a\xf6\x01\n\x15PatientWithRoomAndBed\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12I\n\x04room\x18\x03 \x01(\x0b\x32\x35.services.tasks_svc.v1.GetRecentPatientsResponse.RoomR\x04room\x12\x46\n\x03\x62\x65\x64\x18\x04 \x01(\x0b\x32\x34.services.tasks_svc.v1.GetRecentPatientsResponse.BedR\x03\x62\x65\x64\"\xaa\x01\n\x14UpdatePatientRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12?\n\x19human_readable_identifier\x18\x02 \x01(\tH\x00R\x17humanReadableIdentifier\x88\x01\x01\x12\x19\n\x05notes\x18\x03 \x01(\tH\x01R\x05notes\x88\x01\x01\x42\x1c\n\x1a_human_readable_identifierB\x08\n\x06_notes\"\x17\n\x15UpdatePatientResponse\"9\n\x10\x41ssignBedRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x15\n\x06\x62\x65\x64_id\x18\x02 \x01(\tR\x05\x62\x65\x64Id\"\x13\n\x11\x41ssignBedResponse\"$\n\x12UnassignBedRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x15\n\x13UnassignBedResponse\")\n\x17\x44ischargePatientRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x1a\n\x18\x44ischargePatientResponse\"6\n\x15ReadmitPatientRequest\x12\x1d\n\npatient_id\x18\x01 \x01(\tR\tpatientId\"\x18\n\x16ReadmitPatientResponse2\xec\x0b\n\x0ePatientService\x12l\n\rCreatePatient\x12+.services.tasks_svc.v1.CreatePatientRequest\x1a,.services.tasks_svc.v1.CreatePatientResponse\"\x00\x12\x63\n\nGetPatient\x12(.services.tasks_svc.v1.GetPatientRequest\x1a).services.tasks_svc.v1.GetPatientResponse\"\x00\x12r\n\x0fGetPatientByBed\x12-.services.tasks_svc.v1.GetPatientByBedRequest\x1a..services.tasks_svc.v1.GetPatientByBedResponse\"\x00\x12x\n\x11GetPatientsByWard\x12/.services.tasks_svc.v1.GetPatientsByWardRequest\x1a\x30.services.tasks_svc.v1.GetPatientsByWardResponse\"\x00\x12\x93\x01\n\x1aGetPatientAssignmentByWard\x12\x38.services.tasks_svc.v1.GetPatientAssignmentByWardRequest\x1a\x39.services.tasks_svc.v1.GetPatientAssignmentByWardResponse\"\x00\x12x\n\x11GetPatientDetails\x12/.services.tasks_svc.v1.GetPatientDetailsRequest\x1a\x30.services.tasks_svc.v1.GetPatientDetailsResponse\"\x00\x12o\n\x0eGetPatientList\x12,.services.tasks_svc.v1.GetPatientListRequest\x1a-.services.tasks_svc.v1.GetPatientListResponse\"\x00\x12x\n\x11GetRecentPatients\x12/.services.tasks_svc.v1.GetRecentPatientsRequest\x1a\x30.services.tasks_svc.v1.GetRecentPatientsResponse\"\x00\x12l\n\rUpdatePatient\x12+.services.tasks_svc.v1.UpdatePatientRequest\x1a,.services.tasks_svc.v1.UpdatePatientResponse\"\x00\x12`\n\tAssignBed\x12\'.services.tasks_svc.v1.AssignBedRequest\x1a(.services.tasks_svc.v1.AssignBedResponse\"\x00\x12\x66\n\x0bUnassignBed\x12).services.tasks_svc.v1.UnassignBedRequest\x1a*.services.tasks_svc.v1.UnassignBedResponse\"\x00\x12u\n\x10\x44ischargePatient\x12..services.tasks_svc.v1.DischargePatientRequest\x1a/.services.tasks_svc.v1.DischargePatientResponse\"\x00\x12o\n\x0eReadmitPatient\x12,.services.tasks_svc.v1.ReadmitPatientRequest\x1a-.services.tasks_svc.v1.ReadmitPatientResponse\"\x00\x42\xbc\x01\n\x19\x63om.services.tasks_svc.v1B\x0fPatientSvcProtoP\x01Z\x1cgen/proto/services/tasks-svc\xa2\x02\x03STX\xaa\x02\x14Services.TasksSvc.V1\xca\x02\x14Services\\TasksSvc\\V1\xe2\x02 Services\\TasksSvc\\V1\\GPBMetadata\xea\x02\x16Services::TasksSvc::V1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\'services/tasks_svc/v1/patient_svc.proto\x12\x15services.tasks_svc.v1\x1a!services/tasks_svc/v1/types.proto\"w\n\x14\x43reatePatientRequest\x12:\n\x19human_readable_identifier\x18\x01 \x01(\tR\x17humanReadableIdentifier\x12\x19\n\x05notes\x18\x02 \x01(\tH\x00R\x05notes\x88\x01\x01\x42\x08\n\x06_notes\"\'\n\x15\x43reatePatientResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"#\n\x11GetPatientRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xd7\x03\n\x12GetPatientResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x14\n\x05notes\x18\x03 \x01(\tR\x05notes\x12\x1a\n\x06\x62\x65\x64_id\x18\x04 \x01(\tH\x00R\x05\x62\x65\x64Id\x88\x01\x01\x12\x1c\n\x07ward_id\x18\x05 \x01(\tH\x01R\x06wardId\x88\x01\x01\x12G\n\x04room\x18\x07 \x01(\x0b\x32..services.tasks_svc.v1.GetPatientResponse.RoomH\x02R\x04room\x88\x01\x01\x12\x44\n\x03\x62\x65\x64\x18\x08 \x01(\x0b\x32-.services.tasks_svc.v1.GetPatientResponse.BedH\x03R\x03\x62\x65\x64\x88\x01\x01\x1a\x43\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x03 \x01(\tR\x06wardId\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04nameB\t\n\x07_bed_idB\n\n\x08_ward_idB\x07\n\x05_roomB\x06\n\x04_bed\"/\n\x16GetPatientByBedRequest\x12\x15\n\x06\x62\x65\x64_id\x18\x01 \x01(\tR\x05\x62\x65\x64Id\"\xa2\x01\n\x17GetPatientByBedResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x14\n\x05notes\x18\x03 \x01(\tR\x05notes\x12\x1a\n\x06\x62\x65\x64_id\x18\x04 \x01(\tH\x00R\x05\x62\x65\x64Id\x88\x01\x01\x42\t\n\x07_bed_id\"3\n\x18GetPatientsByWardRequest\x12\x17\n\x07ward_id\x18\x01 \x01(\tR\x06wardId\"\x86\x02\n\x19GetPatientsByWardResponse\x12T\n\x08patients\x18\x01 \x03(\x0b\x32\x38.services.tasks_svc.v1.GetPatientsByWardResponse.PatientR\x08patients\x1a\x92\x01\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x14\n\x05notes\x18\x03 \x01(\tR\x05notes\x12\x1a\n\x06\x62\x65\x64_id\x18\x04 \x01(\tH\x00R\x05\x62\x65\x64Id\x88\x01\x01\x42\t\n\x07_bed_id\"<\n!GetPatientAssignmentByWardRequest\x12\x17\n\x07ward_id\x18\x01 \x01(\tR\x06wardId\"\xd1\x03\n\"GetPatientAssignmentByWardResponse\x12T\n\x05rooms\x18\x01 \x03(\x0b\x32>.services.tasks_svc.v1.GetPatientAssignmentByWardResponse.RoomR\x05rooms\x1a\xd4\x02\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12V\n\x04\x62\x65\x64s\x18\x03 \x03(\x0b\x32\x42.services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.BedR\x04\x62\x65\x64s\x1a\xcf\x01\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12i\n\x07patient\x18\x03 \x01(\x0b\x32J.services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.Bed.PatientH\x00R\x07patient\x88\x01\x01\x1a-\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04nameB\n\n\x08_patient\"*\n\x18GetPatientDetailsRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xb0\x07\n\x19GetPatientDetailsResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x14\n\x05notes\x18\x03 \x01(\tR\x05notes\x12K\n\x05tasks\x18\x04 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetPatientDetailsResponse.TaskR\x05tasks\x12N\n\x04room\x18\x05 \x01(\x0b\x32\x35.services.tasks_svc.v1.GetPatientDetailsResponse.RoomH\x00R\x04room\x88\x01\x01\x12K\n\x03\x62\x65\x64\x18\x06 \x01(\x0b\x32\x34.services.tasks_svc.v1.GetPatientDetailsResponse.BedH\x01R\x03\x62\x65\x64\x88\x01\x01\x12#\n\ris_discharged\x18\x07 \x01(\x08R\x0cisDischarged\x1a\x43\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x03 \x01(\tR\x06wardId\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x1a\xa0\x03\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x39\n\x06status\x18\x04 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12-\n\x10\x61ssigned_user_id\x18\x05 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12\x1d\n\npatient_id\x18\x06 \x01(\tR\tpatientId\x12\x16\n\x06public\x18\x07 \x01(\x08R\x06public\x12Y\n\x08subtasks\x18\x08 \x03(\x0b\x32=.services.tasks_svc.v1.GetPatientDetailsResponse.Task.SubTaskR\x08subtasks\x1a\x41\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64oneB\x13\n\x11_assigned_user_idB\x07\n\x05_roomB\x06\n\x04_bed\"A\n\x15GetPatientListRequest\x12\x1c\n\x07ward_id\x18\x01 \x01(\tH\x00R\x06wardId\x88\x01\x01\x42\n\n\x08_ward_id\"\x8c\t\n\x16GetPatientListResponse\x12M\n\x06\x61\x63tive\x18\x01 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetPatientListResponse.PatientR\x06\x61\x63tive\x12\x66\n\x13unassigned_patients\x18\x02 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetPatientListResponse.PatientR\x12unassignedPatients\x12\x66\n\x13\x64ischarged_patients\x18\x03 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetPatientListResponse.PatientR\x12\x64ischargedPatients\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x1a\x43\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x03 \x01(\tR\x06wardId\x1a\xc2\x02\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x46\n\x04room\x18\x03 \x01(\x0b\x32\x32.services.tasks_svc.v1.GetPatientListResponse.RoomR\x04room\x12\x43\n\x03\x62\x65\x64\x18\x04 \x01(\x0b\x32\x31.services.tasks_svc.v1.GetPatientListResponse.BedR\x03\x62\x65\x64\x12\x14\n\x05notes\x18\x05 \x01(\tR\x05notes\x12H\n\x05tasks\x18\x06 \x03(\x0b\x32\x32.services.tasks_svc.v1.GetPatientListResponse.TaskR\x05tasks\x1a\x9d\x03\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x39\n\x06status\x18\x04 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12-\n\x10\x61ssigned_user_id\x18\x05 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12\x1d\n\npatient_id\x18\x06 \x01(\tR\tpatientId\x12\x16\n\x06public\x18\x07 \x01(\x08R\x06public\x12V\n\x08subtasks\x18\x08 \x03(\x0b\x32:.services.tasks_svc.v1.GetPatientListResponse.Task.SubTaskR\x08subtasks\x1a\x41\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64oneB\x13\n\x11_assigned_user_id\"\x1a\n\x18GetRecentPatientsRequest\"\xf5\x03\n\x19GetRecentPatientsResponse\x12o\n\x0frecent_patients\x18\x01 \x03(\x0b\x32\x46.services.tasks_svc.v1.GetRecentPatientsResponse.PatientWithRoomAndBedR\x0erecentPatients\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x1a\x43\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x03 \x01(\tR\x06wardId\x1a\xf6\x01\n\x15PatientWithRoomAndBed\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12I\n\x04room\x18\x03 \x01(\x0b\x32\x35.services.tasks_svc.v1.GetRecentPatientsResponse.RoomR\x04room\x12\x46\n\x03\x62\x65\x64\x18\x04 \x01(\x0b\x32\x34.services.tasks_svc.v1.GetRecentPatientsResponse.BedR\x03\x62\x65\x64\"\xaa\x01\n\x14UpdatePatientRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12?\n\x19human_readable_identifier\x18\x02 \x01(\tH\x00R\x17humanReadableIdentifier\x88\x01\x01\x12\x19\n\x05notes\x18\x03 \x01(\tH\x01R\x05notes\x88\x01\x01\x42\x1c\n\x1a_human_readable_identifierB\x08\n\x06_notes\"\x17\n\x15UpdatePatientResponse\"9\n\x10\x41ssignBedRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x15\n\x06\x62\x65\x64_id\x18\x02 \x01(\tR\x05\x62\x65\x64Id\"\x13\n\x11\x41ssignBedResponse\"$\n\x12UnassignBedRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x15\n\x13UnassignBedResponse\")\n\x17\x44ischargePatientRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x1a\n\x18\x44ischargePatientResponse\"6\n\x15ReadmitPatientRequest\x12\x1d\n\npatient_id\x18\x01 \x01(\tR\tpatientId\"\x18\n\x16ReadmitPatientResponse\"&\n\x14\x44\x65letePatientRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x17\n\x15\x44\x65letePatientResponse2\xda\x0c\n\x0ePatientService\x12l\n\rCreatePatient\x12+.services.tasks_svc.v1.CreatePatientRequest\x1a,.services.tasks_svc.v1.CreatePatientResponse\"\x00\x12\x63\n\nGetPatient\x12(.services.tasks_svc.v1.GetPatientRequest\x1a).services.tasks_svc.v1.GetPatientResponse\"\x00\x12r\n\x0fGetPatientByBed\x12-.services.tasks_svc.v1.GetPatientByBedRequest\x1a..services.tasks_svc.v1.GetPatientByBedResponse\"\x00\x12x\n\x11GetPatientsByWard\x12/.services.tasks_svc.v1.GetPatientsByWardRequest\x1a\x30.services.tasks_svc.v1.GetPatientsByWardResponse\"\x00\x12\x93\x01\n\x1aGetPatientAssignmentByWard\x12\x38.services.tasks_svc.v1.GetPatientAssignmentByWardRequest\x1a\x39.services.tasks_svc.v1.GetPatientAssignmentByWardResponse\"\x00\x12x\n\x11GetPatientDetails\x12/.services.tasks_svc.v1.GetPatientDetailsRequest\x1a\x30.services.tasks_svc.v1.GetPatientDetailsResponse\"\x00\x12o\n\x0eGetPatientList\x12,.services.tasks_svc.v1.GetPatientListRequest\x1a-.services.tasks_svc.v1.GetPatientListResponse\"\x00\x12x\n\x11GetRecentPatients\x12/.services.tasks_svc.v1.GetRecentPatientsRequest\x1a\x30.services.tasks_svc.v1.GetRecentPatientsResponse\"\x00\x12l\n\rUpdatePatient\x12+.services.tasks_svc.v1.UpdatePatientRequest\x1a,.services.tasks_svc.v1.UpdatePatientResponse\"\x00\x12`\n\tAssignBed\x12\'.services.tasks_svc.v1.AssignBedRequest\x1a(.services.tasks_svc.v1.AssignBedResponse\"\x00\x12\x66\n\x0bUnassignBed\x12).services.tasks_svc.v1.UnassignBedRequest\x1a*.services.tasks_svc.v1.UnassignBedResponse\"\x00\x12u\n\x10\x44ischargePatient\x12..services.tasks_svc.v1.DischargePatientRequest\x1a/.services.tasks_svc.v1.DischargePatientResponse\"\x00\x12o\n\x0eReadmitPatient\x12,.services.tasks_svc.v1.ReadmitPatientRequest\x1a-.services.tasks_svc.v1.ReadmitPatientResponse\"\x00\x12l\n\rDeletePatient\x12+.services.tasks_svc.v1.DeletePatientRequest\x1a,.services.tasks_svc.v1.DeletePatientResponse\"\x00\x42\xbc\x01\n\x19\x63om.services.tasks_svc.v1B\x0fPatientSvcProtoP\x01Z\x1cgen/proto/services/tasks-svc\xa2\x02\x03STX\xaa\x02\x14Services.TasksSvc.V1\xca\x02\x14Services\\TasksSvc\\V1\xe2\x02 Services\\TasksSvc\\V1\\GPBMetadata\xea\x02\x16Services::TasksSvc::V1b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -111,6 +111,10 @@
   _globals['_READMITPATIENTREQUEST']._serialized_end=5057
   _globals['_READMITPATIENTRESPONSE']._serialized_start=5059
   _globals['_READMITPATIENTRESPONSE']._serialized_end=5083
-  _globals['_PATIENTSERVICE']._serialized_start=5086
-  _globals['_PATIENTSERVICE']._serialized_end=6602
+  _globals['_DELETEPATIENTREQUEST']._serialized_start=5085
+  _globals['_DELETEPATIENTREQUEST']._serialized_end=5123
+  _globals['_DELETEPATIENTRESPONSE']._serialized_start=5125
+  _globals['_DELETEPATIENTRESPONSE']._serialized_end=5148
+  _globals['_PATIENTSERVICE']._serialized_start=5151
+  _globals['_PATIENTSERVICE']._serialized_end=6777
 # @@protoc_insertion_point(module_scope)
diff --git a/gen/python/services/tasks_svc/v1/patient_svc_pb2_grpc.py b/gen/python/services/tasks_svc/v1/patient_svc_pb2_grpc.py
index 41a2cd00c..b4c4048c4 100644
--- a/gen/python/services/tasks_svc/v1/patient_svc_pb2_grpc.py
+++ b/gen/python/services/tasks_svc/v1/patient_svc_pb2_grpc.py
@@ -83,6 +83,11 @@ def __init__(self, channel):
                 request_serializer=services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.ReadmitPatientRequest.SerializeToString,
                 response_deserializer=services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.ReadmitPatientResponse.FromString,
                 _registered_method=True)
+        self.DeletePatient = channel.unary_unary(
+                '/services.tasks_svc.v1.PatientService/DeletePatient',
+                request_serializer=services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.DeletePatientRequest.SerializeToString,
+                response_deserializer=services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.DeletePatientResponse.FromString,
+                _registered_method=True)
 
 
 class PatientServiceServicer(object):
@@ -170,6 +175,12 @@ def ReadmitPatient(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def DeletePatient(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
 
 def add_PatientServiceServicer_to_server(servicer, server):
     rpc_method_handlers = {
@@ -238,6 +249,11 @@ def add_PatientServiceServicer_to_server(servicer, server):
                     request_deserializer=services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.ReadmitPatientRequest.FromString,
                     response_serializer=services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.ReadmitPatientResponse.SerializeToString,
             ),
+            'DeletePatient': grpc.unary_unary_rpc_method_handler(
+                    servicer.DeletePatient,
+                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.DeletePatientRequest.FromString,
+                    response_serializer=services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.DeletePatientResponse.SerializeToString,
+            ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
             'services.tasks_svc.v1.PatientService', rpc_method_handlers)
@@ -603,3 +619,30 @@ def ReadmitPatient(request,
             timeout,
             metadata,
             _registered_method=True)
+
+    @staticmethod
+    def DeletePatient(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/services.tasks_svc.v1.PatientService/DeletePatient',
+            services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.DeletePatientRequest.SerializeToString,
+            services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.DeletePatientResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
diff --git a/gen/python/services/tasks_svc/v1/room_svc_pb2.py b/gen/python/services/tasks_svc/v1/room_svc_pb2.py
index 6b5b22f90..601b3ef31 100644
--- a/gen/python/services/tasks_svc/v1/room_svc_pb2.py
+++ b/gen/python/services/tasks_svc/v1/room_svc_pb2.py
@@ -14,7 +14,7 @@
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$services/tasks_svc/v1/room_svc.proto\x12\x15services.tasks_svc.v1\"@\n\x11\x43reateRoomRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x02 \x01(\tR\x06wardId\"$\n\x12\x43reateRoomResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\" \n\x0eGetRoomRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xb9\x01\n\x0fGetRoomResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12>\n\x04\x62\x65\x64s\x18\x03 \x03(\x0b\x32*.services.tasks_svc.v1.GetRoomResponse.BedR\x04\x62\x65\x64s\x12\x17\n\x07ward_id\x18\x05 \x01(\tR\x06wardId\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\"\x11\n\x0fGetRoomsRequest\"\x8d\x02\n\x10GetRoomsResponse\x12\x42\n\x05rooms\x18\x01 \x03(\x0b\x32,.services.tasks_svc.v1.GetRoomsResponse.RoomR\x05rooms\x1a\xb4\x01\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x44\n\x04\x62\x65\x64s\x18\x03 \x03(\x0b\x32\x30.services.tasks_svc.v1.GetRoomsResponse.Room.BedR\x04\x62\x65\x64s\x12\x17\n\x07ward_id\x18\x05 \x01(\tR\x06wardId\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\"0\n\x15GetRoomsByWardRequest\x12\x17\n\x07ward_id\x18\x01 \x01(\tR\x06wardId\"\x9f\x02\n\x16GetRoomsByWardResponse\x12H\n\x05rooms\x18\x01 \x03(\x0b\x32\x32.services.tasks_svc.v1.GetRoomsByWardResponse.RoomR\x05rooms\x1a\xba\x01\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12J\n\x04\x62\x65\x64s\x18\x03 \x03(\x0b\x32\x36.services.tasks_svc.v1.GetRoomsByWardResponse.Room.BedR\x04\x62\x65\x64s\x12\x17\n\x07ward_id\x18\x05 \x01(\tR\x06wardId\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\"E\n\x11UpdateRoomRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x17\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x88\x01\x01\x42\x07\n\x05_name\"\x14\n\x12UpdateRoomResponse\"#\n\x11\x44\x65leteRoomRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x14\n\x12\x44\x65leteRoomResponse\"/\n\x1dGetRoomOverviewsByWardRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xe2\x04\n\x1eGetRoomOverviewsByWardResponse\x12P\n\x05rooms\x18\x01 \x03(\x0b\x32:.services.tasks_svc.v1.GetRoomOverviewsByWardResponse.RoomR\x05rooms\x1a\xed\x03\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12R\n\x04\x62\x65\x64s\x18\x03 \x03(\x0b\x32>.services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.BedR\x04\x62\x65\x64s\x1a\xec\x02\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\x12\x65\n\x07patient\x18\x02 \x01(\x0b\x32\x46.services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.Bed.PatientH\x00R\x07patient\x88\x01\x01\x1a\xcd\x01\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12+\n\x11tasks_unscheduled\x18\x03 \x01(\rR\x10tasksUnscheduled\x12*\n\x11tasks_in_progress\x18\x04 \x01(\rR\x0ftasksInProgress\x12\x1d\n\ntasks_done\x18\x05 \x01(\rR\ttasksDoneB\n\n\x08_patient2\xf2\x05\n\x0bRoomService\x12\x63\n\nCreateRoom\x12(.services.tasks_svc.v1.CreateRoomRequest\x1a).services.tasks_svc.v1.CreateRoomResponse\"\x00\x12Z\n\x07GetRoom\x12%.services.tasks_svc.v1.GetRoomRequest\x1a&.services.tasks_svc.v1.GetRoomResponse\"\x00\x12]\n\x08GetRooms\x12&.services.tasks_svc.v1.GetRoomsRequest\x1a\'.services.tasks_svc.v1.GetRoomsResponse\"\x00\x12o\n\x0eGetRoomsByWard\x12,.services.tasks_svc.v1.GetRoomsByWardRequest\x1a-.services.tasks_svc.v1.GetRoomsByWardResponse\"\x00\x12\x63\n\nUpdateRoom\x12(.services.tasks_svc.v1.UpdateRoomRequest\x1a).services.tasks_svc.v1.UpdateRoomResponse\"\x00\x12\x63\n\nDeleteRoom\x12(.services.tasks_svc.v1.DeleteRoomRequest\x1a).services.tasks_svc.v1.DeleteRoomResponse\"\x00\x12\x87\x01\n\x16GetRoomOverviewsByWard\x12\x34.services.tasks_svc.v1.GetRoomOverviewsByWardRequest\x1a\x35.services.tasks_svc.v1.GetRoomOverviewsByWardResponse\"\x00\x42\xb9\x01\n\x19\x63om.services.tasks_svc.v1B\x0cRoomSvcProtoP\x01Z\x1cgen/proto/services/tasks-svc\xa2\x02\x03STX\xaa\x02\x14Services.TasksSvc.V1\xca\x02\x14Services\\TasksSvc\\V1\xe2\x02 Services\\TasksSvc\\V1\\GPBMetadata\xea\x02\x16Services::TasksSvc::V1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$services/tasks_svc/v1/room_svc.proto\x12\x15services.tasks_svc.v1\"@\n\x11\x43reateRoomRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x02 \x01(\tR\x06wardId\"$\n\x12\x43reateRoomResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\" \n\x0eGetRoomRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xb9\x01\n\x0fGetRoomResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12>\n\x04\x62\x65\x64s\x18\x03 \x03(\x0b\x32*.services.tasks_svc.v1.GetRoomResponse.BedR\x04\x62\x65\x64s\x12\x17\n\x07ward_id\x18\x05 \x01(\tR\x06wardId\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\";\n\x0fGetRoomsRequest\x12\x1c\n\x07ward_id\x18\x01 \x01(\tH\x00R\x06wardId\x88\x01\x01\x42\n\n\x08_ward_id\"\x8d\x02\n\x10GetRoomsResponse\x12\x42\n\x05rooms\x18\x01 \x03(\x0b\x32,.services.tasks_svc.v1.GetRoomsResponse.RoomR\x05rooms\x1a\xb4\x01\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x44\n\x04\x62\x65\x64s\x18\x03 \x03(\x0b\x32\x30.services.tasks_svc.v1.GetRoomsResponse.Room.BedR\x04\x62\x65\x64s\x12\x17\n\x07ward_id\x18\x05 \x01(\tR\x06wardId\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\"E\n\x11UpdateRoomRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x17\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x88\x01\x01\x42\x07\n\x05_name\"\x14\n\x12UpdateRoomResponse\"#\n\x11\x44\x65leteRoomRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x14\n\x12\x44\x65leteRoomResponse\"/\n\x1dGetRoomOverviewsByWardRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xe2\x04\n\x1eGetRoomOverviewsByWardResponse\x12P\n\x05rooms\x18\x01 \x03(\x0b\x32:.services.tasks_svc.v1.GetRoomOverviewsByWardResponse.RoomR\x05rooms\x1a\xed\x03\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12R\n\x04\x62\x65\x64s\x18\x03 \x03(\x0b\x32>.services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.BedR\x04\x62\x65\x64s\x1a\xec\x02\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\x12\x65\n\x07patient\x18\x02 \x01(\x0b\x32\x46.services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.Bed.PatientH\x00R\x07patient\x88\x01\x01\x1a\xcd\x01\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12+\n\x11tasks_unscheduled\x18\x03 \x01(\rR\x10tasksUnscheduled\x12*\n\x11tasks_in_progress\x18\x04 \x01(\rR\x0ftasksInProgress\x12\x1d\n\ntasks_done\x18\x05 \x01(\rR\ttasksDoneB\n\n\x08_patient2\x81\x05\n\x0bRoomService\x12\x63\n\nCreateRoom\x12(.services.tasks_svc.v1.CreateRoomRequest\x1a).services.tasks_svc.v1.CreateRoomResponse\"\x00\x12Z\n\x07GetRoom\x12%.services.tasks_svc.v1.GetRoomRequest\x1a&.services.tasks_svc.v1.GetRoomResponse\"\x00\x12]\n\x08GetRooms\x12&.services.tasks_svc.v1.GetRoomsRequest\x1a\'.services.tasks_svc.v1.GetRoomsResponse\"\x00\x12\x63\n\nUpdateRoom\x12(.services.tasks_svc.v1.UpdateRoomRequest\x1a).services.tasks_svc.v1.UpdateRoomResponse\"\x00\x12\x63\n\nDeleteRoom\x12(.services.tasks_svc.v1.DeleteRoomRequest\x1a).services.tasks_svc.v1.DeleteRoomResponse\"\x00\x12\x87\x01\n\x16GetRoomOverviewsByWard\x12\x34.services.tasks_svc.v1.GetRoomOverviewsByWardRequest\x1a\x35.services.tasks_svc.v1.GetRoomOverviewsByWardResponse\"\x00\x42\xb9\x01\n\x19\x63om.services.tasks_svc.v1B\x0cRoomSvcProtoP\x01Z\x1cgen/proto/services/tasks-svc\xa2\x02\x03STX\xaa\x02\x14Services.TasksSvc.V1\xca\x02\x14Services\\TasksSvc\\V1\xe2\x02 Services\\TasksSvc\\V1\\GPBMetadata\xea\x02\x16Services::TasksSvc::V1b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -33,39 +33,31 @@
   _globals['_GETROOMRESPONSE_BED']._serialized_start=346
   _globals['_GETROOMRESPONSE_BED']._serialized_end=387
   _globals['_GETROOMSREQUEST']._serialized_start=389
-  _globals['_GETROOMSREQUEST']._serialized_end=406
-  _globals['_GETROOMSRESPONSE']._serialized_start=409
-  _globals['_GETROOMSRESPONSE']._serialized_end=678
-  _globals['_GETROOMSRESPONSE_ROOM']._serialized_start=498
-  _globals['_GETROOMSRESPONSE_ROOM']._serialized_end=678
+  _globals['_GETROOMSREQUEST']._serialized_end=448
+  _globals['_GETROOMSRESPONSE']._serialized_start=451
+  _globals['_GETROOMSRESPONSE']._serialized_end=720
+  _globals['_GETROOMSRESPONSE_ROOM']._serialized_start=540
+  _globals['_GETROOMSRESPONSE_ROOM']._serialized_end=720
   _globals['_GETROOMSRESPONSE_ROOM_BED']._serialized_start=346
   _globals['_GETROOMSRESPONSE_ROOM_BED']._serialized_end=387
-  _globals['_GETROOMSBYWARDREQUEST']._serialized_start=680
-  _globals['_GETROOMSBYWARDREQUEST']._serialized_end=728
-  _globals['_GETROOMSBYWARDRESPONSE']._serialized_start=731
-  _globals['_GETROOMSBYWARDRESPONSE']._serialized_end=1018
-  _globals['_GETROOMSBYWARDRESPONSE_ROOM']._serialized_start=832
-  _globals['_GETROOMSBYWARDRESPONSE_ROOM']._serialized_end=1018
-  _globals['_GETROOMSBYWARDRESPONSE_ROOM_BED']._serialized_start=346
-  _globals['_GETROOMSBYWARDRESPONSE_ROOM_BED']._serialized_end=387
-  _globals['_UPDATEROOMREQUEST']._serialized_start=1020
-  _globals['_UPDATEROOMREQUEST']._serialized_end=1089
-  _globals['_UPDATEROOMRESPONSE']._serialized_start=1091
-  _globals['_UPDATEROOMRESPONSE']._serialized_end=1111
-  _globals['_DELETEROOMREQUEST']._serialized_start=1113
-  _globals['_DELETEROOMREQUEST']._serialized_end=1148
-  _globals['_DELETEROOMRESPONSE']._serialized_start=1150
-  _globals['_DELETEROOMRESPONSE']._serialized_end=1170
-  _globals['_GETROOMOVERVIEWSBYWARDREQUEST']._serialized_start=1172
-  _globals['_GETROOMOVERVIEWSBYWARDREQUEST']._serialized_end=1219
-  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE']._serialized_start=1222
-  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE']._serialized_end=1832
-  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM']._serialized_start=1339
-  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM']._serialized_end=1832
-  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM_BED']._serialized_start=1468
-  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM_BED']._serialized_end=1832
-  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM_BED_PATIENT']._serialized_start=1615
-  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM_BED_PATIENT']._serialized_end=1820
-  _globals['_ROOMSERVICE']._serialized_start=1835
-  _globals['_ROOMSERVICE']._serialized_end=2589
+  _globals['_UPDATEROOMREQUEST']._serialized_start=722
+  _globals['_UPDATEROOMREQUEST']._serialized_end=791
+  _globals['_UPDATEROOMRESPONSE']._serialized_start=793
+  _globals['_UPDATEROOMRESPONSE']._serialized_end=813
+  _globals['_DELETEROOMREQUEST']._serialized_start=815
+  _globals['_DELETEROOMREQUEST']._serialized_end=850
+  _globals['_DELETEROOMRESPONSE']._serialized_start=852
+  _globals['_DELETEROOMRESPONSE']._serialized_end=872
+  _globals['_GETROOMOVERVIEWSBYWARDREQUEST']._serialized_start=874
+  _globals['_GETROOMOVERVIEWSBYWARDREQUEST']._serialized_end=921
+  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE']._serialized_start=924
+  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE']._serialized_end=1534
+  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM']._serialized_start=1041
+  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM']._serialized_end=1534
+  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM_BED']._serialized_start=1170
+  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM_BED']._serialized_end=1534
+  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM_BED_PATIENT']._serialized_start=1317
+  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM_BED_PATIENT']._serialized_end=1522
+  _globals['_ROOMSERVICE']._serialized_start=1537
+  _globals['_ROOMSERVICE']._serialized_end=2178
 # @@protoc_insertion_point(module_scope)
diff --git a/gen/python/services/tasks_svc/v1/room_svc_pb2_grpc.py b/gen/python/services/tasks_svc/v1/room_svc_pb2_grpc.py
index 3f778e082..3f06d59f5 100644
--- a/gen/python/services/tasks_svc/v1/room_svc_pb2_grpc.py
+++ b/gen/python/services/tasks_svc/v1/room_svc_pb2_grpc.py
@@ -33,11 +33,6 @@ def __init__(self, channel):
                 request_serializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsRequest.SerializeToString,
                 response_deserializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsResponse.FromString,
                 _registered_method=True)
-        self.GetRoomsByWard = channel.unary_unary(
-                '/services.tasks_svc.v1.RoomService/GetRoomsByWard',
-                request_serializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsByWardRequest.SerializeToString,
-                response_deserializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsByWardResponse.FromString,
-                _registered_method=True)
         self.UpdateRoom = channel.unary_unary(
                 '/services.tasks_svc.v1.RoomService/UpdateRoom',
                 request_serializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.UpdateRoomRequest.SerializeToString,
@@ -80,12 +75,6 @@ def GetRooms(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def GetRoomsByWard(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
     def UpdateRoom(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -122,11 +111,6 @@ def add_RoomServiceServicer_to_server(servicer, server):
                     request_deserializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsRequest.FromString,
                     response_serializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsResponse.SerializeToString,
             ),
-            'GetRoomsByWard': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetRoomsByWard,
-                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsByWardRequest.FromString,
-                    response_serializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsByWardResponse.SerializeToString,
-            ),
             'UpdateRoom': grpc.unary_unary_rpc_method_handler(
                     servicer.UpdateRoom,
                     request_deserializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.UpdateRoomRequest.FromString,
@@ -238,33 +222,6 @@ def GetRooms(request,
             metadata,
             _registered_method=True)
 
-    @staticmethod
-    def GetRoomsByWard(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/services.tasks_svc.v1.RoomService/GetRoomsByWard',
-            services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsByWardRequest.SerializeToString,
-            services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsByWardResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
     @staticmethod
     def UpdateRoom(request,
             target,
diff --git a/gen/python/services/tasks_svc/v1/task_svc_pb2.py b/gen/python/services/tasks_svc/v1/task_svc_pb2.py
index e0f7e3d89..8a59e49f7 100644
--- a/gen/python/services/tasks_svc/v1/task_svc_pb2.py
+++ b/gen/python/services/tasks_svc/v1/task_svc_pb2.py
@@ -16,7 +16,7 @@
 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$services/tasks_svc/v1/task_svc.proto\x12\x15services.tasks_svc.v1\x1a!services/tasks_svc/v1/types.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xba\x02\n\x11\x43reateTaskRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12%\n\x0b\x64\x65scription\x18\x02 \x01(\tH\x00R\x0b\x64\x65scription\x88\x01\x01\x12\x1d\n\npatient_id\x18\x03 \x01(\tR\tpatientId\x12\x1b\n\x06public\x18\x04 \x01(\x08H\x01R\x06public\x88\x01\x01\x12\x31\n\x06\x64ue_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x05\x64ueAt\x12M\n\x0einitial_status\x18\x06 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusH\x02R\rinitialStatus\x88\x01\x01\x42\x0e\n\x0c_descriptionB\t\n\x07_publicB\x11\n\x0f_initial_status\"$\n\x12\x43reateTaskResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x8a\x02\n\x11UpdateTaskRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x17\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x88\x01\x01\x12%\n\x0b\x64\x65scription\x18\x03 \x01(\tH\x01R\x0b\x64\x65scription\x88\x01\x01\x12\x36\n\x06\x64ue_at\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampH\x02R\x05\x64ueAt\x88\x01\x01\x12>\n\x06status\x18\x05 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusH\x03R\x06status\x88\x01\x01\x42\x07\n\x05_nameB\x0e\n\x0c_descriptionB\t\n\x07_due_atB\t\n\x07_status\"\x14\n\x12UpdateTaskResponse\" \n\x0eGetTaskRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xa0\x03\n\x0fGetTaskResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12-\n\x10\x61ssigned_user_id\x18\x04 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12J\n\x08subtasks\x18\x05 \x03(\x0b\x32..services.tasks_svc.v1.GetTaskResponse.SubtaskR\x08subtasks\x12\x39\n\x06status\x18\x06 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x1a\x41\n\x07Subtask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64oneB\x13\n\x11_assigned_user_id\"9\n\x18GetTasksByPatientRequest\x12\x1d\n\npatient_id\x18\x01 \x01(\tR\tpatientId\"\xb7\x05\n\x19GetTasksByPatientResponse\x12K\n\x05tasks\x18\x01 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetTasksByPatientResponse.TaskR\x05tasks\x1a\xcc\x04\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x39\n\x06status\x18\x04 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12-\n\x10\x61ssigned_user_id\x18\x05 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12\x1d\n\npatient_id\x18\x06 \x01(\tR\tpatientId\x12\x16\n\x06public\x18\x07 \x01(\x08R\x06public\x12\x31\n\x06\x64ue_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x05\x64ueAt\x12\x1d\n\ncreated_by\x18\t \x01(\tR\tcreatedBy\x12Y\n\x08subtasks\x18\n \x03(\x0b\x32=.services.tasks_svc.v1.GetTasksByPatientResponse.Task.SubTaskR\x08subtasks\x12\x39\n\ncreated_at\x18\x0b \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x1a`\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64one\x12\x1d\n\ncreated_by\x18\x04 \x01(\tR\tcreatedByB\x13\n\x11_assigned_user_id\"G\n&GetTasksByPatientSortedByStatusRequest\x12\x1d\n\npatient_id\x18\x01 \x01(\tR\tpatientId\"\xe3\x06\n\'GetTasksByPatientSortedByStatusResponse\x12W\n\x04todo\x18\x01 \x03(\x0b\x32\x43.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.TaskR\x04todo\x12\x64\n\x0bin_progress\x18\x02 \x03(\x0b\x32\x43.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.TaskR\ninProgress\x12W\n\x04\x64one\x18\x03 \x03(\x0b\x32\x43.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.TaskR\x04\x64one\x1a\x9f\x04\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12-\n\x10\x61ssigned_user_id\x18\x04 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12\x1d\n\npatient_id\x18\x05 \x01(\tR\tpatientId\x12\x16\n\x06public\x18\x06 \x01(\x08R\x06public\x12\x31\n\x06\x64ue_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x05\x64ueAt\x12\x1d\n\ncreated_by\x18\x08 \x01(\tR\tcreatedBy\x12g\n\x08subtasks\x18\t \x03(\x0b\x32K.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task.SubTaskR\x08subtasks\x12\x39\n\ncreated_at\x18\n \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x1a`\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64one\x12\x1d\n\ncreated_by\x18\x04 \x01(\tR\tcreatedByB\x13\n\x11_assigned_user_id\"\x19\n\x17GetAssignedTasksRequest\"\x82\x06\n\x18GetAssignedTasksResponse\x12J\n\x05tasks\x18\x01 \x03(\x0b\x32\x34.services.tasks_svc.v1.GetAssignedTasksResponse.TaskR\x05tasks\x1a\x99\x05\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x39\n\x06status\x18\x04 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12(\n\x10\x61ssigned_user_id\x18\x05 \x01(\tR\x0e\x61ssignedUserId\x12V\n\x07patient\x18\x06 \x01(\x0b\x32<.services.tasks_svc.v1.GetAssignedTasksResponse.Task.PatientR\x07patient\x12\x16\n\x06public\x18\x07 \x01(\x08R\x06public\x12\x31\n\x06\x64ue_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x05\x64ueAt\x12\x1d\n\ncreated_by\x18\t \x01(\tR\tcreatedBy\x12X\n\x08subtasks\x18\n \x03(\x0b\x32<.services.tasks_svc.v1.GetAssignedTasksResponse.Task.SubTaskR\x08subtasks\x12\x39\n\ncreated_at\x18\x0b \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x1a-\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x1a`\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64one\x12\x1d\n\ncreated_by\x18\x04 \x01(\tR\tcreatedBy\"E\n\x11\x41ssignTaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x17\n\x07user_id\x18\x02 \x01(\tR\x06userId\"\x14\n\x12\x41ssignTaskResponse\"G\n\x13UnassignTaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x17\n\x07user_id\x18\x02 \x01(\tR\x06userId\"\x16\n\x14UnassignTaskResponse\"\x9d\x01\n\x14\x43reateSubtaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12M\n\x07subtask\x18\x02 \x01(\x0b\x32\x33.services.tasks_svc.v1.CreateSubtaskRequest.SubtaskR\x07subtask\x1a\x1d\n\x07Subtask\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"6\n\x15\x43reateSubtaskResponse\x12\x1d\n\nsubtask_id\x18\x01 \x01(\tR\tsubtaskId\"\xca\x01\n\x14UpdateSubtaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x1d\n\nsubtask_id\x18\x02 \x01(\tR\tsubtaskId\x12M\n\x07subtask\x18\x03 \x01(\x0b\x32\x33.services.tasks_svc.v1.UpdateSubtaskRequest.SubtaskR\x07subtask\x1a+\n\x07Subtask\x12\x17\n\x04name\x18\x01 \x01(\tH\x00R\x04name\x88\x01\x01\x42\x07\n\x05_name\"\x17\n\x15UpdateSubtaskResponse\"P\n\x16\x43ompleteSubtaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x1d\n\nsubtask_id\x18\x02 \x01(\tR\tsubtaskId\"\x19\n\x17\x43ompleteSubtaskResponse\"R\n\x18UncompleteSubtaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x1d\n\nsubtask_id\x18\x02 \x01(\tR\tsubtaskId\"\x1b\n\x19UncompleteSubtaskResponse\"N\n\x14\x44\x65leteSubtaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x1d\n\nsubtask_id\x18\x02 \x01(\tR\tsubtaskId\"\x17\n\x15\x44\x65leteSubtaskResponse2\xd1\x0b\n\x0bTaskService\x12\x63\n\nCreateTask\x12(.services.tasks_svc.v1.CreateTaskRequest\x1a).services.tasks_svc.v1.CreateTaskResponse\"\x00\x12\x63\n\nUpdateTask\x12(.services.tasks_svc.v1.UpdateTaskRequest\x1a).services.tasks_svc.v1.UpdateTaskResponse\"\x00\x12Z\n\x07GetTask\x12%.services.tasks_svc.v1.GetTaskRequest\x1a&.services.tasks_svc.v1.GetTaskResponse\"\x00\x12x\n\x11GetTasksByPatient\x12/.services.tasks_svc.v1.GetTasksByPatientRequest\x1a\x30.services.tasks_svc.v1.GetTasksByPatientResponse\"\x00\x12\xa2\x01\n\x1fGetTasksByPatientSortedByStatus\x12=.services.tasks_svc.v1.GetTasksByPatientSortedByStatusRequest\x1a>.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse\"\x00\x12u\n\x10GetAssignedTasks\x12..services.tasks_svc.v1.GetAssignedTasksRequest\x1a/.services.tasks_svc.v1.GetAssignedTasksResponse\"\x00\x12\x63\n\nAssignTask\x12(.services.tasks_svc.v1.AssignTaskRequest\x1a).services.tasks_svc.v1.AssignTaskResponse\"\x00\x12i\n\x0cUnassignTask\x12*.services.tasks_svc.v1.UnassignTaskRequest\x1a+.services.tasks_svc.v1.UnassignTaskResponse\"\x00\x12l\n\rCreateSubtask\x12+.services.tasks_svc.v1.CreateSubtaskRequest\x1a,.services.tasks_svc.v1.CreateSubtaskResponse\"\x00\x12l\n\rUpdateSubtask\x12+.services.tasks_svc.v1.UpdateSubtaskRequest\x1a,.services.tasks_svc.v1.UpdateSubtaskResponse\"\x00\x12r\n\x0f\x43ompleteSubtask\x12-.services.tasks_svc.v1.CompleteSubtaskRequest\x1a..services.tasks_svc.v1.CompleteSubtaskResponse\"\x00\x12x\n\x11UncompleteSubtask\x12/.services.tasks_svc.v1.UncompleteSubtaskRequest\x1a\x30.services.tasks_svc.v1.UncompleteSubtaskResponse\"\x00\x12l\n\rDeleteSubtask\x12+.services.tasks_svc.v1.DeleteSubtaskRequest\x1a,.services.tasks_svc.v1.DeleteSubtaskResponse\"\x00\x42\xb9\x01\n\x19\x63om.services.tasks_svc.v1B\x0cTaskSvcProtoP\x01Z\x1cgen/proto/services/tasks-svc\xa2\x02\x03STX\xaa\x02\x14Services.TasksSvc.V1\xca\x02\x14Services\\TasksSvc\\V1\xe2\x02 Services\\TasksSvc\\V1\\GPBMetadata\xea\x02\x16Services::TasksSvc::V1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$services/tasks_svc/v1/task_svc.proto\x12\x15services.tasks_svc.v1\x1a!services/tasks_svc/v1/types.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xff\x03\n\x11\x43reateTaskRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12%\n\x0b\x64\x65scription\x18\x02 \x01(\tH\x00R\x0b\x64\x65scription\x88\x01\x01\x12\x1d\n\npatient_id\x18\x03 \x01(\tR\tpatientId\x12\x1b\n\x06public\x18\x04 \x01(\x08H\x01R\x06public\x88\x01\x01\x12\x31\n\x06\x64ue_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x05\x64ueAt\x12M\n\x0einitial_status\x18\x06 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusH\x02R\rinitialStatus\x88\x01\x01\x12-\n\x10\x61ssigned_user_id\x18\x07 \x01(\tH\x03R\x0e\x61ssignedUserId\x88\x01\x01\x12L\n\x08subtasks\x18\x08 \x03(\x0b\x32\x30.services.tasks_svc.v1.CreateTaskRequest.SubTaskR\x08subtasks\x1a\x31\n\x07SubTask\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x02 \x01(\x08R\x04\x64oneB\x0e\n\x0c_descriptionB\t\n\x07_publicB\x11\n\x0f_initial_statusB\x13\n\x11_assigned_user_id\"$\n\x12\x43reateTaskResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xb2\x02\n\x11UpdateTaskRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x17\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x88\x01\x01\x12%\n\x0b\x64\x65scription\x18\x03 \x01(\tH\x01R\x0b\x64\x65scription\x88\x01\x01\x12\x36\n\x06\x64ue_at\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampH\x02R\x05\x64ueAt\x88\x01\x01\x12>\n\x06status\x18\x05 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusH\x03R\x06status\x88\x01\x01\x12\x1b\n\x06public\x18\x06 \x01(\x08H\x04R\x06public\x88\x01\x01\x42\x07\n\x05_nameB\x0e\n\x0c_descriptionB\t\n\x07_due_atB\t\n\x07_statusB\t\n\x07_public\"\x14\n\x12UpdateTaskResponse\" \n\x0eGetTaskRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xca\x05\n\x0fGetTaskResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12-\n\x10\x61ssigned_user_id\x18\x04 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12J\n\x08subtasks\x18\x05 \x03(\x0b\x32..services.tasks_svc.v1.GetTaskResponse.SubTaskR\x08subtasks\x12\x39\n\x06status\x18\x06 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x12\x16\n\x06public\x18\x08 \x01(\x08R\x06public\x12\x31\n\x06\x64ue_at\x18\t \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x05\x64ueAt\x12\x1d\n\ncreated_by\x18\n \x01(\tR\tcreatedBy\x12H\n\x07patient\x18\x0b \x01(\x0b\x32..services.tasks_svc.v1.GetTaskResponse.PatientR\x07patient\x1aU\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x1a`\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64one\x12\x1d\n\ncreated_by\x18\x04 \x01(\tR\tcreatedByB\x13\n\x11_assigned_user_id\"9\n\x18GetTasksByPatientRequest\x12\x1d\n\npatient_id\x18\x01 \x01(\tR\tpatientId\"\xb7\x05\n\x19GetTasksByPatientResponse\x12K\n\x05tasks\x18\x01 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetTasksByPatientResponse.TaskR\x05tasks\x1a\xcc\x04\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x39\n\x06status\x18\x04 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12-\n\x10\x61ssigned_user_id\x18\x05 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12\x1d\n\npatient_id\x18\x06 \x01(\tR\tpatientId\x12\x16\n\x06public\x18\x07 \x01(\x08R\x06public\x12\x31\n\x06\x64ue_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x05\x64ueAt\x12\x1d\n\ncreated_by\x18\t \x01(\tR\tcreatedBy\x12Y\n\x08subtasks\x18\n \x03(\x0b\x32=.services.tasks_svc.v1.GetTasksByPatientResponse.Task.SubTaskR\x08subtasks\x12\x39\n\ncreated_at\x18\x0b \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x1a`\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64one\x12\x1d\n\ncreated_by\x18\x04 \x01(\tR\tcreatedByB\x13\n\x11_assigned_user_id\"G\n&GetTasksByPatientSortedByStatusRequest\x12\x1d\n\npatient_id\x18\x01 \x01(\tR\tpatientId\"\xe3\x06\n\'GetTasksByPatientSortedByStatusResponse\x12W\n\x04todo\x18\x01 \x03(\x0b\x32\x43.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.TaskR\x04todo\x12\x64\n\x0bin_progress\x18\x02 \x03(\x0b\x32\x43.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.TaskR\ninProgress\x12W\n\x04\x64one\x18\x03 \x03(\x0b\x32\x43.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.TaskR\x04\x64one\x1a\x9f\x04\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12-\n\x10\x61ssigned_user_id\x18\x04 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12\x1d\n\npatient_id\x18\x05 \x01(\tR\tpatientId\x12\x16\n\x06public\x18\x06 \x01(\x08R\x06public\x12\x31\n\x06\x64ue_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x05\x64ueAt\x12\x1d\n\ncreated_by\x18\x08 \x01(\tR\tcreatedBy\x12g\n\x08subtasks\x18\t \x03(\x0b\x32K.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task.SubTaskR\x08subtasks\x12\x39\n\ncreated_at\x18\n \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x1a`\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64one\x12\x1d\n\ncreated_by\x18\x04 \x01(\tR\tcreatedByB\x13\n\x11_assigned_user_id\"\x19\n\x17GetAssignedTasksRequest\"\xaa\x06\n\x18GetAssignedTasksResponse\x12J\n\x05tasks\x18\x01 \x03(\x0b\x32\x34.services.tasks_svc.v1.GetAssignedTasksResponse.TaskR\x05tasks\x1a\xc1\x05\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x39\n\x06status\x18\x04 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12(\n\x10\x61ssigned_user_id\x18\x05 \x01(\tR\x0e\x61ssignedUserId\x12V\n\x07patient\x18\x06 \x01(\x0b\x32<.services.tasks_svc.v1.GetAssignedTasksResponse.Task.PatientR\x07patient\x12\x16\n\x06public\x18\x07 \x01(\x08R\x06public\x12\x31\n\x06\x64ue_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x05\x64ueAt\x12\x1d\n\ncreated_by\x18\t \x01(\tR\tcreatedBy\x12X\n\x08subtasks\x18\n \x03(\x0b\x32<.services.tasks_svc.v1.GetAssignedTasksResponse.Task.SubTaskR\x08subtasks\x12\x39\n\ncreated_at\x18\x0b \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x1aU\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x1a`\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64one\x12\x1d\n\ncreated_by\x18\x04 \x01(\tR\tcreatedBy\"E\n\x11\x41ssignTaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x17\n\x07user_id\x18\x02 \x01(\tR\x06userId\"\x14\n\x12\x41ssignTaskResponse\"G\n\x13UnassignTaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x17\n\x07user_id\x18\x02 \x01(\tR\x06userId\"\x16\n\x14UnassignTaskResponse\"\xb1\x01\n\x14\x43reateSubtaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12M\n\x07subtask\x18\x02 \x01(\x0b\x32\x33.services.tasks_svc.v1.CreateSubtaskRequest.SubtaskR\x07subtask\x1a\x31\n\x07Subtask\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x02 \x01(\x08R\x04\x64one\"6\n\x15\x43reateSubtaskResponse\x12\x1d\n\nsubtask_id\x18\x01 \x01(\tR\tsubtaskId\"\xec\x01\n\x14UpdateSubtaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x1d\n\nsubtask_id\x18\x02 \x01(\tR\tsubtaskId\x12M\n\x07subtask\x18\x03 \x01(\x0b\x32\x33.services.tasks_svc.v1.UpdateSubtaskRequest.SubtaskR\x07subtask\x1aM\n\x07Subtask\x12\x17\n\x04name\x18\x01 \x01(\tH\x00R\x04name\x88\x01\x01\x12\x17\n\x04\x64one\x18\x02 \x01(\x08H\x01R\x04\x64one\x88\x01\x01\x42\x07\n\x05_nameB\x07\n\x05_done\"\x17\n\x15UpdateSubtaskResponse\"N\n\x14\x44\x65leteSubtaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x1d\n\nsubtask_id\x18\x02 \x01(\tR\tsubtaskId\"\x17\n\x15\x44\x65leteSubtaskResponse\"3\n\x18RemoveTaskDueDateRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\"\x1b\n\x19RemoveTaskDueDateResponse\"#\n\x11\x44\x65leteTaskRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x14\n\x12\x44\x65leteTaskResponse2\xc2\x0b\n\x0bTaskService\x12\x63\n\nCreateTask\x12(.services.tasks_svc.v1.CreateTaskRequest\x1a).services.tasks_svc.v1.CreateTaskResponse\"\x00\x12\x63\n\nUpdateTask\x12(.services.tasks_svc.v1.UpdateTaskRequest\x1a).services.tasks_svc.v1.UpdateTaskResponse\"\x00\x12Z\n\x07GetTask\x12%.services.tasks_svc.v1.GetTaskRequest\x1a&.services.tasks_svc.v1.GetTaskResponse\"\x00\x12x\n\x11GetTasksByPatient\x12/.services.tasks_svc.v1.GetTasksByPatientRequest\x1a\x30.services.tasks_svc.v1.GetTasksByPatientResponse\"\x00\x12\xa2\x01\n\x1fGetTasksByPatientSortedByStatus\x12=.services.tasks_svc.v1.GetTasksByPatientSortedByStatusRequest\x1a>.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse\"\x00\x12u\n\x10GetAssignedTasks\x12..services.tasks_svc.v1.GetAssignedTasksRequest\x1a/.services.tasks_svc.v1.GetAssignedTasksResponse\"\x00\x12\x63\n\nAssignTask\x12(.services.tasks_svc.v1.AssignTaskRequest\x1a).services.tasks_svc.v1.AssignTaskResponse\"\x00\x12i\n\x0cUnassignTask\x12*.services.tasks_svc.v1.UnassignTaskRequest\x1a+.services.tasks_svc.v1.UnassignTaskResponse\"\x00\x12l\n\rCreateSubtask\x12+.services.tasks_svc.v1.CreateSubtaskRequest\x1a,.services.tasks_svc.v1.CreateSubtaskResponse\"\x00\x12l\n\rUpdateSubtask\x12+.services.tasks_svc.v1.UpdateSubtaskRequest\x1a,.services.tasks_svc.v1.UpdateSubtaskResponse\"\x00\x12l\n\rDeleteSubtask\x12+.services.tasks_svc.v1.DeleteSubtaskRequest\x1a,.services.tasks_svc.v1.DeleteSubtaskResponse\"\x00\x12x\n\x11RemoveTaskDueDate\x12/.services.tasks_svc.v1.RemoveTaskDueDateRequest\x1a\x30.services.tasks_svc.v1.RemoveTaskDueDateResponse\"\x00\x12\x63\n\nDeleteTask\x12(.services.tasks_svc.v1.DeleteTaskRequest\x1a).services.tasks_svc.v1.DeleteTaskResponse\"\x00\x42\xb9\x01\n\x19\x63om.services.tasks_svc.v1B\x0cTaskSvcProtoP\x01Z\x1cgen/proto/services/tasks-svc\xa2\x02\x03STX\xaa\x02\x14Services.TasksSvc.V1\xca\x02\x14Services\\TasksSvc\\V1\xe2\x02 Services\\TasksSvc\\V1\\GPBMetadata\xea\x02\x16Services::TasksSvc::V1b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -25,77 +25,81 @@
   _globals['DESCRIPTOR']._options = None
   _globals['DESCRIPTOR']._serialized_options = b'\n\031com.services.tasks_svc.v1B\014TaskSvcProtoP\001Z\034gen/proto/services/tasks-svc\242\002\003STX\252\002\024Services.TasksSvc.V1\312\002\024Services\\TasksSvc\\V1\342\002 Services\\TasksSvc\\V1\\GPBMetadata\352\002\026Services::TasksSvc::V1'
   _globals['_CREATETASKREQUEST']._serialized_start=132
-  _globals['_CREATETASKREQUEST']._serialized_end=446
-  _globals['_CREATETASKRESPONSE']._serialized_start=448
-  _globals['_CREATETASKRESPONSE']._serialized_end=484
-  _globals['_UPDATETASKREQUEST']._serialized_start=487
-  _globals['_UPDATETASKREQUEST']._serialized_end=753
-  _globals['_UPDATETASKRESPONSE']._serialized_start=755
-  _globals['_UPDATETASKRESPONSE']._serialized_end=775
-  _globals['_GETTASKREQUEST']._serialized_start=777
-  _globals['_GETTASKREQUEST']._serialized_end=809
-  _globals['_GETTASKRESPONSE']._serialized_start=812
-  _globals['_GETTASKRESPONSE']._serialized_end=1228
-  _globals['_GETTASKRESPONSE_SUBTASK']._serialized_start=1142
-  _globals['_GETTASKRESPONSE_SUBTASK']._serialized_end=1207
-  _globals['_GETTASKSBYPATIENTREQUEST']._serialized_start=1230
-  _globals['_GETTASKSBYPATIENTREQUEST']._serialized_end=1287
-  _globals['_GETTASKSBYPATIENTRESPONSE']._serialized_start=1290
-  _globals['_GETTASKSBYPATIENTRESPONSE']._serialized_end=1985
-  _globals['_GETTASKSBYPATIENTRESPONSE_TASK']._serialized_start=1397
-  _globals['_GETTASKSBYPATIENTRESPONSE_TASK']._serialized_end=1985
-  _globals['_GETTASKSBYPATIENTRESPONSE_TASK_SUBTASK']._serialized_start=1868
-  _globals['_GETTASKSBYPATIENTRESPONSE_TASK_SUBTASK']._serialized_end=1964
-  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSREQUEST']._serialized_start=1987
-  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSREQUEST']._serialized_end=2058
-  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE']._serialized_start=2061
-  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE']._serialized_end=2928
-  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE_TASK']._serialized_start=2385
-  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE_TASK']._serialized_end=2928
-  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE_TASK_SUBTASK']._serialized_start=1868
-  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE_TASK_SUBTASK']._serialized_end=1964
-  _globals['_GETASSIGNEDTASKSREQUEST']._serialized_start=2930
-  _globals['_GETASSIGNEDTASKSREQUEST']._serialized_end=2955
-  _globals['_GETASSIGNEDTASKSRESPONSE']._serialized_start=2958
-  _globals['_GETASSIGNEDTASKSRESPONSE']._serialized_end=3728
-  _globals['_GETASSIGNEDTASKSRESPONSE_TASK']._serialized_start=3063
-  _globals['_GETASSIGNEDTASKSRESPONSE_TASK']._serialized_end=3728
-  _globals['_GETASSIGNEDTASKSRESPONSE_TASK_PATIENT']._serialized_start=3585
-  _globals['_GETASSIGNEDTASKSRESPONSE_TASK_PATIENT']._serialized_end=3630
-  _globals['_GETASSIGNEDTASKSRESPONSE_TASK_SUBTASK']._serialized_start=1868
-  _globals['_GETASSIGNEDTASKSRESPONSE_TASK_SUBTASK']._serialized_end=1964
-  _globals['_ASSIGNTASKREQUEST']._serialized_start=3730
-  _globals['_ASSIGNTASKREQUEST']._serialized_end=3799
-  _globals['_ASSIGNTASKRESPONSE']._serialized_start=3801
-  _globals['_ASSIGNTASKRESPONSE']._serialized_end=3821
-  _globals['_UNASSIGNTASKREQUEST']._serialized_start=3823
-  _globals['_UNASSIGNTASKREQUEST']._serialized_end=3894
-  _globals['_UNASSIGNTASKRESPONSE']._serialized_start=3896
-  _globals['_UNASSIGNTASKRESPONSE']._serialized_end=3918
-  _globals['_CREATESUBTASKREQUEST']._serialized_start=3921
-  _globals['_CREATESUBTASKREQUEST']._serialized_end=4078
-  _globals['_CREATESUBTASKREQUEST_SUBTASK']._serialized_start=4049
-  _globals['_CREATESUBTASKREQUEST_SUBTASK']._serialized_end=4078
-  _globals['_CREATESUBTASKRESPONSE']._serialized_start=4080
-  _globals['_CREATESUBTASKRESPONSE']._serialized_end=4134
-  _globals['_UPDATESUBTASKREQUEST']._serialized_start=4137
-  _globals['_UPDATESUBTASKREQUEST']._serialized_end=4339
-  _globals['_UPDATESUBTASKREQUEST_SUBTASK']._serialized_start=4296
-  _globals['_UPDATESUBTASKREQUEST_SUBTASK']._serialized_end=4339
-  _globals['_UPDATESUBTASKRESPONSE']._serialized_start=4341
-  _globals['_UPDATESUBTASKRESPONSE']._serialized_end=4364
-  _globals['_COMPLETESUBTASKREQUEST']._serialized_start=4366
-  _globals['_COMPLETESUBTASKREQUEST']._serialized_end=4446
-  _globals['_COMPLETESUBTASKRESPONSE']._serialized_start=4448
-  _globals['_COMPLETESUBTASKRESPONSE']._serialized_end=4473
-  _globals['_UNCOMPLETESUBTASKREQUEST']._serialized_start=4475
-  _globals['_UNCOMPLETESUBTASKREQUEST']._serialized_end=4557
-  _globals['_UNCOMPLETESUBTASKRESPONSE']._serialized_start=4559
-  _globals['_UNCOMPLETESUBTASKRESPONSE']._serialized_end=4586
-  _globals['_DELETESUBTASKREQUEST']._serialized_start=4588
-  _globals['_DELETESUBTASKREQUEST']._serialized_end=4666
-  _globals['_DELETESUBTASKRESPONSE']._serialized_start=4668
-  _globals['_DELETESUBTASKRESPONSE']._serialized_end=4691
-  _globals['_TASKSERVICE']._serialized_start=4694
-  _globals['_TASKSERVICE']._serialized_end=6183
+  _globals['_CREATETASKREQUEST']._serialized_end=643
+  _globals['_CREATETASKREQUEST_SUBTASK']._serialized_start=527
+  _globals['_CREATETASKREQUEST_SUBTASK']._serialized_end=576
+  _globals['_CREATETASKRESPONSE']._serialized_start=645
+  _globals['_CREATETASKRESPONSE']._serialized_end=681
+  _globals['_UPDATETASKREQUEST']._serialized_start=684
+  _globals['_UPDATETASKREQUEST']._serialized_end=990
+  _globals['_UPDATETASKRESPONSE']._serialized_start=992
+  _globals['_UPDATETASKRESPONSE']._serialized_end=1012
+  _globals['_GETTASKREQUEST']._serialized_start=1014
+  _globals['_GETTASKREQUEST']._serialized_end=1046
+  _globals['_GETTASKRESPONSE']._serialized_start=1049
+  _globals['_GETTASKRESPONSE']._serialized_end=1763
+  _globals['_GETTASKRESPONSE_PATIENT']._serialized_start=1559
+  _globals['_GETTASKRESPONSE_PATIENT']._serialized_end=1644
+  _globals['_GETTASKRESPONSE_SUBTASK']._serialized_start=1646
+  _globals['_GETTASKRESPONSE_SUBTASK']._serialized_end=1742
+  _globals['_GETTASKSBYPATIENTREQUEST']._serialized_start=1765
+  _globals['_GETTASKSBYPATIENTREQUEST']._serialized_end=1822
+  _globals['_GETTASKSBYPATIENTRESPONSE']._serialized_start=1825
+  _globals['_GETTASKSBYPATIENTRESPONSE']._serialized_end=2520
+  _globals['_GETTASKSBYPATIENTRESPONSE_TASK']._serialized_start=1932
+  _globals['_GETTASKSBYPATIENTRESPONSE_TASK']._serialized_end=2520
+  _globals['_GETTASKSBYPATIENTRESPONSE_TASK_SUBTASK']._serialized_start=1646
+  _globals['_GETTASKSBYPATIENTRESPONSE_TASK_SUBTASK']._serialized_end=1742
+  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSREQUEST']._serialized_start=2522
+  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSREQUEST']._serialized_end=2593
+  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE']._serialized_start=2596
+  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE']._serialized_end=3463
+  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE_TASK']._serialized_start=2920
+  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE_TASK']._serialized_end=3463
+  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE_TASK_SUBTASK']._serialized_start=1646
+  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE_TASK_SUBTASK']._serialized_end=1742
+  _globals['_GETASSIGNEDTASKSREQUEST']._serialized_start=3465
+  _globals['_GETASSIGNEDTASKSREQUEST']._serialized_end=3490
+  _globals['_GETASSIGNEDTASKSRESPONSE']._serialized_start=3493
+  _globals['_GETASSIGNEDTASKSRESPONSE']._serialized_end=4303
+  _globals['_GETASSIGNEDTASKSRESPONSE_TASK']._serialized_start=3598
+  _globals['_GETASSIGNEDTASKSRESPONSE_TASK']._serialized_end=4303
+  _globals['_GETASSIGNEDTASKSRESPONSE_TASK_PATIENT']._serialized_start=1559
+  _globals['_GETASSIGNEDTASKSRESPONSE_TASK_PATIENT']._serialized_end=1644
+  _globals['_GETASSIGNEDTASKSRESPONSE_TASK_SUBTASK']._serialized_start=1646
+  _globals['_GETASSIGNEDTASKSRESPONSE_TASK_SUBTASK']._serialized_end=1742
+  _globals['_ASSIGNTASKREQUEST']._serialized_start=4305
+  _globals['_ASSIGNTASKREQUEST']._serialized_end=4374
+  _globals['_ASSIGNTASKRESPONSE']._serialized_start=4376
+  _globals['_ASSIGNTASKRESPONSE']._serialized_end=4396
+  _globals['_UNASSIGNTASKREQUEST']._serialized_start=4398
+  _globals['_UNASSIGNTASKREQUEST']._serialized_end=4469
+  _globals['_UNASSIGNTASKRESPONSE']._serialized_start=4471
+  _globals['_UNASSIGNTASKRESPONSE']._serialized_end=4493
+  _globals['_CREATESUBTASKREQUEST']._serialized_start=4496
+  _globals['_CREATESUBTASKREQUEST']._serialized_end=4673
+  _globals['_CREATESUBTASKREQUEST_SUBTASK']._serialized_start=4624
+  _globals['_CREATESUBTASKREQUEST_SUBTASK']._serialized_end=4673
+  _globals['_CREATESUBTASKRESPONSE']._serialized_start=4675
+  _globals['_CREATESUBTASKRESPONSE']._serialized_end=4729
+  _globals['_UPDATESUBTASKREQUEST']._serialized_start=4732
+  _globals['_UPDATESUBTASKREQUEST']._serialized_end=4968
+  _globals['_UPDATESUBTASKREQUEST_SUBTASK']._serialized_start=4891
+  _globals['_UPDATESUBTASKREQUEST_SUBTASK']._serialized_end=4968
+  _globals['_UPDATESUBTASKRESPONSE']._serialized_start=4970
+  _globals['_UPDATESUBTASKRESPONSE']._serialized_end=4993
+  _globals['_DELETESUBTASKREQUEST']._serialized_start=4995
+  _globals['_DELETESUBTASKREQUEST']._serialized_end=5073
+  _globals['_DELETESUBTASKRESPONSE']._serialized_start=5075
+  _globals['_DELETESUBTASKRESPONSE']._serialized_end=5098
+  _globals['_REMOVETASKDUEDATEREQUEST']._serialized_start=5100
+  _globals['_REMOVETASKDUEDATEREQUEST']._serialized_end=5151
+  _globals['_REMOVETASKDUEDATERESPONSE']._serialized_start=5153
+  _globals['_REMOVETASKDUEDATERESPONSE']._serialized_end=5180
+  _globals['_DELETETASKREQUEST']._serialized_start=5182
+  _globals['_DELETETASKREQUEST']._serialized_end=5217
+  _globals['_DELETETASKRESPONSE']._serialized_start=5219
+  _globals['_DELETETASKRESPONSE']._serialized_end=5239
+  _globals['_TASKSERVICE']._serialized_start=5242
+  _globals['_TASKSERVICE']._serialized_end=6716
 # @@protoc_insertion_point(module_scope)
diff --git a/gen/python/services/tasks_svc/v1/task_svc_pb2_grpc.py b/gen/python/services/tasks_svc/v1/task_svc_pb2_grpc.py
index e36871cc4..aaf0a0413 100644
--- a/gen/python/services/tasks_svc/v1/task_svc_pb2_grpc.py
+++ b/gen/python/services/tasks_svc/v1/task_svc_pb2_grpc.py
@@ -68,21 +68,21 @@ def __init__(self, channel):
                 request_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UpdateSubtaskRequest.SerializeToString,
                 response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UpdateSubtaskResponse.FromString,
                 _registered_method=True)
-        self.CompleteSubtask = channel.unary_unary(
-                '/services.tasks_svc.v1.TaskService/CompleteSubtask',
-                request_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.CompleteSubtaskRequest.SerializeToString,
-                response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.CompleteSubtaskResponse.FromString,
-                _registered_method=True)
-        self.UncompleteSubtask = channel.unary_unary(
-                '/services.tasks_svc.v1.TaskService/UncompleteSubtask',
-                request_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UncompleteSubtaskRequest.SerializeToString,
-                response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UncompleteSubtaskResponse.FromString,
-                _registered_method=True)
         self.DeleteSubtask = channel.unary_unary(
                 '/services.tasks_svc.v1.TaskService/DeleteSubtask',
                 request_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteSubtaskRequest.SerializeToString,
                 response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteSubtaskResponse.FromString,
                 _registered_method=True)
+        self.RemoveTaskDueDate = channel.unary_unary(
+                '/services.tasks_svc.v1.TaskService/RemoveTaskDueDate',
+                request_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.RemoveTaskDueDateRequest.SerializeToString,
+                response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.RemoveTaskDueDateResponse.FromString,
+                _registered_method=True)
+        self.DeleteTask = channel.unary_unary(
+                '/services.tasks_svc.v1.TaskService/DeleteTask',
+                request_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteTaskRequest.SerializeToString,
+                response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteTaskResponse.FromString,
+                _registered_method=True)
 
 
 class TaskServiceServicer(object):
@@ -152,19 +152,19 @@ def UpdateSubtask(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def CompleteSubtask(self, request, context):
+    def DeleteSubtask(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def UncompleteSubtask(self, request, context):
+    def RemoveTaskDueDate(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def DeleteSubtask(self, request, context):
+    def DeleteTask(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
@@ -223,21 +223,21 @@ def add_TaskServiceServicer_to_server(servicer, server):
                     request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UpdateSubtaskRequest.FromString,
                     response_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UpdateSubtaskResponse.SerializeToString,
             ),
-            'CompleteSubtask': grpc.unary_unary_rpc_method_handler(
-                    servicer.CompleteSubtask,
-                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.CompleteSubtaskRequest.FromString,
-                    response_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.CompleteSubtaskResponse.SerializeToString,
-            ),
-            'UncompleteSubtask': grpc.unary_unary_rpc_method_handler(
-                    servicer.UncompleteSubtask,
-                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UncompleteSubtaskRequest.FromString,
-                    response_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UncompleteSubtaskResponse.SerializeToString,
-            ),
             'DeleteSubtask': grpc.unary_unary_rpc_method_handler(
                     servicer.DeleteSubtask,
                     request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteSubtaskRequest.FromString,
                     response_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteSubtaskResponse.SerializeToString,
             ),
+            'RemoveTaskDueDate': grpc.unary_unary_rpc_method_handler(
+                    servicer.RemoveTaskDueDate,
+                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.RemoveTaskDueDateRequest.FromString,
+                    response_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.RemoveTaskDueDateResponse.SerializeToString,
+            ),
+            'DeleteTask': grpc.unary_unary_rpc_method_handler(
+                    servicer.DeleteTask,
+                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteTaskRequest.FromString,
+                    response_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteTaskResponse.SerializeToString,
+            ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
             'services.tasks_svc.v1.TaskService', rpc_method_handlers)
@@ -524,7 +524,7 @@ def UpdateSubtask(request,
             _registered_method=True)
 
     @staticmethod
-    def CompleteSubtask(request,
+    def DeleteSubtask(request,
             target,
             options=(),
             channel_credentials=None,
@@ -537,9 +537,9 @@ def CompleteSubtask(request,
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/services.tasks_svc.v1.TaskService/CompleteSubtask',
-            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.CompleteSubtaskRequest.SerializeToString,
-            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.CompleteSubtaskResponse.FromString,
+            '/services.tasks_svc.v1.TaskService/DeleteSubtask',
+            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteSubtaskRequest.SerializeToString,
+            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteSubtaskResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -551,7 +551,7 @@ def CompleteSubtask(request,
             _registered_method=True)
 
     @staticmethod
-    def UncompleteSubtask(request,
+    def RemoveTaskDueDate(request,
             target,
             options=(),
             channel_credentials=None,
@@ -564,9 +564,9 @@ def UncompleteSubtask(request,
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/services.tasks_svc.v1.TaskService/UncompleteSubtask',
-            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UncompleteSubtaskRequest.SerializeToString,
-            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UncompleteSubtaskResponse.FromString,
+            '/services.tasks_svc.v1.TaskService/RemoveTaskDueDate',
+            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.RemoveTaskDueDateRequest.SerializeToString,
+            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.RemoveTaskDueDateResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -578,7 +578,7 @@ def UncompleteSubtask(request,
             _registered_method=True)
 
     @staticmethod
-    def DeleteSubtask(request,
+    def DeleteTask(request,
             target,
             options=(),
             channel_credentials=None,
@@ -591,9 +591,9 @@ def DeleteSubtask(request,
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/services.tasks_svc.v1.TaskService/DeleteSubtask',
-            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteSubtaskRequest.SerializeToString,
-            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteSubtaskResponse.FromString,
+            '/services.tasks_svc.v1.TaskService/DeleteTask',
+            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteTaskRequest.SerializeToString,
+            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteTaskResponse.FromString,
             options,
             channel_credentials,
             insecure,
diff --git a/gen/python/services/tasks_svc/v1/task_template_svc_pb2.py b/gen/python/services/tasks_svc/v1/task_template_svc_pb2.py
index 1dfd65413..32de080d9 100644
--- a/gen/python/services/tasks_svc/v1/task_template_svc_pb2.py
+++ b/gen/python/services/tasks_svc/v1/task_template_svc_pb2.py
@@ -14,7 +14,7 @@
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n-services/tasks_svc/v1/task_template_svc.proto\x12\x15services.tasks_svc.v1\"\x85\x02\n\x19\x43reateTaskTemplateRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12%\n\x0b\x64\x65scription\x18\x02 \x01(\tH\x00R\x0b\x64\x65scription\x88\x01\x01\x12\x1c\n\x07ward_id\x18\x04 \x01(\tH\x01R\x06wardId\x88\x01\x01\x12T\n\x08subtasks\x18\x05 \x03(\x0b\x32\x38.services.tasks_svc.v1.CreateTaskTemplateRequest.SubTaskR\x08subtasks\x1a\x1d\n\x07SubTask\x12\x12\n\x04name\x18\x01 \x01(\tR\x04nameB\x0e\n\x0c_descriptionB\n\n\x08_ward_id\",\n\x1a\x43reateTaskTemplateResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x1c\n\x1aGetAllTaskTemplatesRequest\"\xcd\x03\n\x1bGetAllTaskTemplatesResponse\x12]\n\ttemplates\x18\x01 \x03(\x0b\x32?.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplateR\ttemplates\x1a\xce\x02\n\x0cTaskTemplate\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x1b\n\tis_public\x18\x04 \x01(\x08R\x08isPublic\x12\x1d\n\ncreated_by\x18\x06 \x01(\tR\tcreatedBy\x12\x63\n\x08subtasks\x18\x07 \x03(\x0b\x32G.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTaskR\x08subtasks\x1aW\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12(\n\x10task_template_id\x18\x02 \x01(\tR\x0etaskTemplateId\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\"+\n\x19\x44\x65leteTaskTemplateRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x1c\n\x1a\x44\x65leteTaskTemplateResponse\"2\n DeleteTaskTemplateSubTaskRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"#\n!DeleteTaskTemplateSubTaskResponse\"\x84\x01\n\x19UpdateTaskTemplateRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x17\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x88\x01\x01\x12%\n\x0b\x64\x65scription\x18\x03 \x01(\tH\x01R\x0b\x64\x65scription\x88\x01\x01\x42\x07\n\x05_nameB\x0e\n\x0c_description\"\x1c\n\x1aUpdateTaskTemplateResponse\"c\n UpdateTaskTemplateSubTaskRequest\x12\x1d\n\nsubtask_id\x18\x01 \x01(\tR\tsubtaskId\x12\x17\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x88\x01\x01\x42\x07\n\x05_name\"#\n!UpdateTaskTemplateSubTaskResponse\"`\n CreateTaskTemplateSubTaskRequest\x12(\n\x10task_template_id\x18\x01 \x01(\tR\x0etaskTemplateId\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\"3\n!CreateTaskTemplateSubTaskResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"}\n#GetAllTaskTemplatesByCreatorRequest\x12\x1d\n\ncreated_by\x18\x01 \x01(\tR\tcreatedBy\x12&\n\x0cprivate_only\x18\x02 \x01(\x08H\x00R\x0bprivateOnly\x88\x01\x01\x42\x0f\n\r_private_only\"\xc9\x03\n$GetAllTaskTemplatesByCreatorResponse\x12\x66\n\ttemplates\x18\x01 \x03(\x0b\x32H.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplateR\ttemplates\x1a\xb8\x02\n\x0cTaskTemplate\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x1b\n\tis_public\x18\x04 \x01(\x08R\x08isPublic\x12l\n\x08subtasks\x18\x07 \x03(\x0b\x32P.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTaskR\x08subtasks\x1aW\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12(\n\x10task_template_id\x18\x02 \x01(\tR\x0etaskTemplateId\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\";\n GetAllTaskTemplatesByWardRequest\x12\x17\n\x07ward_id\x18\x01 \x01(\tR\x06wardId\"\xdf\x03\n!GetAllTaskTemplatesByWardResponse\x12\x63\n\ttemplates\x18\x01 \x03(\x0b\x32\x45.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplateR\ttemplates\x1a\xd4\x02\n\x0cTaskTemplate\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x1b\n\tis_public\x18\x04 \x01(\x08R\x08isPublic\x12\x1d\n\ncreated_by\x18\x06 \x01(\tR\tcreatedBy\x12i\n\x08subtasks\x18\x07 \x03(\x0b\x32M.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTaskR\x08subtasks\x1aW\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12(\n\x10task_template_id\x18\x02 \x01(\tR\x0etaskTemplateId\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name2\xf4\t\n\x13TaskTemplateService\x12{\n\x12\x43reateTaskTemplate\x12\x30.services.tasks_svc.v1.CreateTaskTemplateRequest\x1a\x31.services.tasks_svc.v1.CreateTaskTemplateResponse\"\x00\x12~\n\x13GetAllTaskTemplates\x12\x31.services.tasks_svc.v1.GetAllTaskTemplatesRequest\x1a\x32.services.tasks_svc.v1.GetAllTaskTemplatesResponse\"\x00\x12{\n\x12\x44\x65leteTaskTemplate\x12\x30.services.tasks_svc.v1.DeleteTaskTemplateRequest\x1a\x31.services.tasks_svc.v1.DeleteTaskTemplateResponse\"\x00\x12\x90\x01\n\x19\x44\x65leteTaskTemplateSubTask\x12\x37.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest\x1a\x38.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse\"\x00\x12{\n\x12UpdateTaskTemplate\x12\x30.services.tasks_svc.v1.UpdateTaskTemplateRequest\x1a\x31.services.tasks_svc.v1.UpdateTaskTemplateResponse\"\x00\x12\x90\x01\n\x19UpdateTaskTemplateSubTask\x12\x37.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest\x1a\x38.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse\"\x00\x12\x90\x01\n\x19\x43reateTaskTemplateSubTask\x12\x37.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest\x1a\x38.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse\"\x00\x12\x99\x01\n\x1cGetAllTaskTemplatesByCreator\x12:.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest\x1a;.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse\"\x00\x12\x90\x01\n\x19GetAllTaskTemplatesByWard\x12\x37.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest\x1a\x38.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse\"\x00\x42\xc1\x01\n\x19\x63om.services.tasks_svc.v1B\x14TaskTemplateSvcProtoP\x01Z\x1cgen/proto/services/tasks-svc\xa2\x02\x03STX\xaa\x02\x14Services.TasksSvc.V1\xca\x02\x14Services\\TasksSvc\\V1\xe2\x02 Services\\TasksSvc\\V1\\GPBMetadata\xea\x02\x16Services::TasksSvc::V1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n-services/tasks_svc/v1/task_template_svc.proto\x12\x15services.tasks_svc.v1\"\x85\x02\n\x19\x43reateTaskTemplateRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12%\n\x0b\x64\x65scription\x18\x02 \x01(\tH\x00R\x0b\x64\x65scription\x88\x01\x01\x12\x1c\n\x07ward_id\x18\x04 \x01(\tH\x01R\x06wardId\x88\x01\x01\x12T\n\x08subtasks\x18\x05 \x03(\x0b\x32\x38.services.tasks_svc.v1.CreateTaskTemplateRequest.SubTaskR\x08subtasks\x1a\x1d\n\x07SubTask\x12\x12\n\x04name\x18\x01 \x01(\tR\x04nameB\x0e\n\x0c_descriptionB\n\n\x08_ward_id\",\n\x1a\x43reateTaskTemplateResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"+\n\x19\x44\x65leteTaskTemplateRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x1c\n\x1a\x44\x65leteTaskTemplateResponse\"2\n DeleteTaskTemplateSubTaskRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"#\n!DeleteTaskTemplateSubTaskResponse\"\x84\x01\n\x19UpdateTaskTemplateRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x17\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x88\x01\x01\x12%\n\x0b\x64\x65scription\x18\x03 \x01(\tH\x01R\x0b\x64\x65scription\x88\x01\x01\x42\x07\n\x05_nameB\x0e\n\x0c_description\"\x1c\n\x1aUpdateTaskTemplateResponse\"c\n UpdateTaskTemplateSubTaskRequest\x12\x1d\n\nsubtask_id\x18\x01 \x01(\tR\tsubtaskId\x12\x17\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x88\x01\x01\x42\x07\n\x05_name\"#\n!UpdateTaskTemplateSubTaskResponse\"`\n CreateTaskTemplateSubTaskRequest\x12(\n\x10task_template_id\x18\x01 \x01(\tR\x0etaskTemplateId\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\"3\n!CreateTaskTemplateSubTaskResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x9c\x01\n\x1aGetAllTaskTemplatesRequest\x12\x1c\n\x07ward_id\x18\x01 \x01(\tH\x00R\x06wardId\x88\x01\x01\x12\"\n\ncreated_by\x18\x02 \x01(\tH\x01R\tcreatedBy\x88\x01\x01\x12!\n\x0cprivate_only\x18\x03 \x01(\x08R\x0bprivateOnlyB\n\n\x08_ward_idB\r\n\x0b_created_by\"\xcd\x03\n\x1bGetAllTaskTemplatesResponse\x12]\n\ttemplates\x18\x01 \x03(\x0b\x32?.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplateR\ttemplates\x1a\xce\x02\n\x0cTaskTemplate\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x1b\n\tis_public\x18\x04 \x01(\x08R\x08isPublic\x12\x1d\n\ncreated_by\x18\x06 \x01(\tR\tcreatedBy\x12\x63\n\x08subtasks\x18\x07 \x03(\x0b\x32G.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTaskR\x08subtasks\x1aW\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12(\n\x10task_template_id\x18\x02 \x01(\tR\x0etaskTemplateId\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name2\xc5\x07\n\x13TaskTemplateService\x12{\n\x12\x43reateTaskTemplate\x12\x30.services.tasks_svc.v1.CreateTaskTemplateRequest\x1a\x31.services.tasks_svc.v1.CreateTaskTemplateResponse\"\x00\x12{\n\x12\x44\x65leteTaskTemplate\x12\x30.services.tasks_svc.v1.DeleteTaskTemplateRequest\x1a\x31.services.tasks_svc.v1.DeleteTaskTemplateResponse\"\x00\x12\x90\x01\n\x19\x44\x65leteTaskTemplateSubTask\x12\x37.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest\x1a\x38.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse\"\x00\x12{\n\x12UpdateTaskTemplate\x12\x30.services.tasks_svc.v1.UpdateTaskTemplateRequest\x1a\x31.services.tasks_svc.v1.UpdateTaskTemplateResponse\"\x00\x12\x90\x01\n\x19UpdateTaskTemplateSubTask\x12\x37.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest\x1a\x38.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse\"\x00\x12\x90\x01\n\x19\x43reateTaskTemplateSubTask\x12\x37.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest\x1a\x38.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse\"\x00\x12~\n\x13GetAllTaskTemplates\x12\x31.services.tasks_svc.v1.GetAllTaskTemplatesRequest\x1a\x32.services.tasks_svc.v1.GetAllTaskTemplatesResponse\"\x00\x42\xc1\x01\n\x19\x63om.services.tasks_svc.v1B\x14TaskTemplateSvcProtoP\x01Z\x1cgen/proto/services/tasks-svc\xa2\x02\x03STX\xaa\x02\x14Services.TasksSvc.V1\xca\x02\x14Services\\TasksSvc\\V1\xe2\x02 Services\\TasksSvc\\V1\\GPBMetadata\xea\x02\x16Services::TasksSvc::V1b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -28,50 +28,34 @@
   _globals['_CREATETASKTEMPLATEREQUEST_SUBTASK']._serialized_end=306
   _globals['_CREATETASKTEMPLATERESPONSE']._serialized_start=336
   _globals['_CREATETASKTEMPLATERESPONSE']._serialized_end=380
-  _globals['_GETALLTASKTEMPLATESREQUEST']._serialized_start=382
-  _globals['_GETALLTASKTEMPLATESREQUEST']._serialized_end=410
-  _globals['_GETALLTASKTEMPLATESRESPONSE']._serialized_start=413
-  _globals['_GETALLTASKTEMPLATESRESPONSE']._serialized_end=874
-  _globals['_GETALLTASKTEMPLATESRESPONSE_TASKTEMPLATE']._serialized_start=540
-  _globals['_GETALLTASKTEMPLATESRESPONSE_TASKTEMPLATE']._serialized_end=874
-  _globals['_GETALLTASKTEMPLATESRESPONSE_TASKTEMPLATE_SUBTASK']._serialized_start=787
-  _globals['_GETALLTASKTEMPLATESRESPONSE_TASKTEMPLATE_SUBTASK']._serialized_end=874
-  _globals['_DELETETASKTEMPLATEREQUEST']._serialized_start=876
-  _globals['_DELETETASKTEMPLATEREQUEST']._serialized_end=919
-  _globals['_DELETETASKTEMPLATERESPONSE']._serialized_start=921
-  _globals['_DELETETASKTEMPLATERESPONSE']._serialized_end=949
-  _globals['_DELETETASKTEMPLATESUBTASKREQUEST']._serialized_start=951
-  _globals['_DELETETASKTEMPLATESUBTASKREQUEST']._serialized_end=1001
-  _globals['_DELETETASKTEMPLATESUBTASKRESPONSE']._serialized_start=1003
-  _globals['_DELETETASKTEMPLATESUBTASKRESPONSE']._serialized_end=1038
-  _globals['_UPDATETASKTEMPLATEREQUEST']._serialized_start=1041
-  _globals['_UPDATETASKTEMPLATEREQUEST']._serialized_end=1173
-  _globals['_UPDATETASKTEMPLATERESPONSE']._serialized_start=1175
-  _globals['_UPDATETASKTEMPLATERESPONSE']._serialized_end=1203
-  _globals['_UPDATETASKTEMPLATESUBTASKREQUEST']._serialized_start=1205
-  _globals['_UPDATETASKTEMPLATESUBTASKREQUEST']._serialized_end=1304
-  _globals['_UPDATETASKTEMPLATESUBTASKRESPONSE']._serialized_start=1306
-  _globals['_UPDATETASKTEMPLATESUBTASKRESPONSE']._serialized_end=1341
-  _globals['_CREATETASKTEMPLATESUBTASKREQUEST']._serialized_start=1343
-  _globals['_CREATETASKTEMPLATESUBTASKREQUEST']._serialized_end=1439
-  _globals['_CREATETASKTEMPLATESUBTASKRESPONSE']._serialized_start=1441
-  _globals['_CREATETASKTEMPLATESUBTASKRESPONSE']._serialized_end=1492
-  _globals['_GETALLTASKTEMPLATESBYCREATORREQUEST']._serialized_start=1494
-  _globals['_GETALLTASKTEMPLATESBYCREATORREQUEST']._serialized_end=1619
-  _globals['_GETALLTASKTEMPLATESBYCREATORRESPONSE']._serialized_start=1622
-  _globals['_GETALLTASKTEMPLATESBYCREATORRESPONSE']._serialized_end=2079
-  _globals['_GETALLTASKTEMPLATESBYCREATORRESPONSE_TASKTEMPLATE']._serialized_start=1767
-  _globals['_GETALLTASKTEMPLATESBYCREATORRESPONSE_TASKTEMPLATE']._serialized_end=2079
-  _globals['_GETALLTASKTEMPLATESBYCREATORRESPONSE_TASKTEMPLATE_SUBTASK']._serialized_start=787
-  _globals['_GETALLTASKTEMPLATESBYCREATORRESPONSE_TASKTEMPLATE_SUBTASK']._serialized_end=874
-  _globals['_GETALLTASKTEMPLATESBYWARDREQUEST']._serialized_start=2081
-  _globals['_GETALLTASKTEMPLATESBYWARDREQUEST']._serialized_end=2140
-  _globals['_GETALLTASKTEMPLATESBYWARDRESPONSE']._serialized_start=2143
-  _globals['_GETALLTASKTEMPLATESBYWARDRESPONSE']._serialized_end=2622
-  _globals['_GETALLTASKTEMPLATESBYWARDRESPONSE_TASKTEMPLATE']._serialized_start=2282
-  _globals['_GETALLTASKTEMPLATESBYWARDRESPONSE_TASKTEMPLATE']._serialized_end=2622
-  _globals['_GETALLTASKTEMPLATESBYWARDRESPONSE_TASKTEMPLATE_SUBTASK']._serialized_start=787
-  _globals['_GETALLTASKTEMPLATESBYWARDRESPONSE_TASKTEMPLATE_SUBTASK']._serialized_end=874
-  _globals['_TASKTEMPLATESERVICE']._serialized_start=2625
-  _globals['_TASKTEMPLATESERVICE']._serialized_end=3893
+  _globals['_DELETETASKTEMPLATEREQUEST']._serialized_start=382
+  _globals['_DELETETASKTEMPLATEREQUEST']._serialized_end=425
+  _globals['_DELETETASKTEMPLATERESPONSE']._serialized_start=427
+  _globals['_DELETETASKTEMPLATERESPONSE']._serialized_end=455
+  _globals['_DELETETASKTEMPLATESUBTASKREQUEST']._serialized_start=457
+  _globals['_DELETETASKTEMPLATESUBTASKREQUEST']._serialized_end=507
+  _globals['_DELETETASKTEMPLATESUBTASKRESPONSE']._serialized_start=509
+  _globals['_DELETETASKTEMPLATESUBTASKRESPONSE']._serialized_end=544
+  _globals['_UPDATETASKTEMPLATEREQUEST']._serialized_start=547
+  _globals['_UPDATETASKTEMPLATEREQUEST']._serialized_end=679
+  _globals['_UPDATETASKTEMPLATERESPONSE']._serialized_start=681
+  _globals['_UPDATETASKTEMPLATERESPONSE']._serialized_end=709
+  _globals['_UPDATETASKTEMPLATESUBTASKREQUEST']._serialized_start=711
+  _globals['_UPDATETASKTEMPLATESUBTASKREQUEST']._serialized_end=810
+  _globals['_UPDATETASKTEMPLATESUBTASKRESPONSE']._serialized_start=812
+  _globals['_UPDATETASKTEMPLATESUBTASKRESPONSE']._serialized_end=847
+  _globals['_CREATETASKTEMPLATESUBTASKREQUEST']._serialized_start=849
+  _globals['_CREATETASKTEMPLATESUBTASKREQUEST']._serialized_end=945
+  _globals['_CREATETASKTEMPLATESUBTASKRESPONSE']._serialized_start=947
+  _globals['_CREATETASKTEMPLATESUBTASKRESPONSE']._serialized_end=998
+  _globals['_GETALLTASKTEMPLATESREQUEST']._serialized_start=1001
+  _globals['_GETALLTASKTEMPLATESREQUEST']._serialized_end=1157
+  _globals['_GETALLTASKTEMPLATESRESPONSE']._serialized_start=1160
+  _globals['_GETALLTASKTEMPLATESRESPONSE']._serialized_end=1621
+  _globals['_GETALLTASKTEMPLATESRESPONSE_TASKTEMPLATE']._serialized_start=1287
+  _globals['_GETALLTASKTEMPLATESRESPONSE_TASKTEMPLATE']._serialized_end=1621
+  _globals['_GETALLTASKTEMPLATESRESPONSE_TASKTEMPLATE_SUBTASK']._serialized_start=1534
+  _globals['_GETALLTASKTEMPLATESRESPONSE_TASKTEMPLATE_SUBTASK']._serialized_end=1621
+  _globals['_TASKTEMPLATESERVICE']._serialized_start=1624
+  _globals['_TASKTEMPLATESERVICE']._serialized_end=2589
 # @@protoc_insertion_point(module_scope)
diff --git a/gen/python/services/tasks_svc/v1/task_template_svc_pb2_grpc.py b/gen/python/services/tasks_svc/v1/task_template_svc_pb2_grpc.py
index cd4d6ab80..0f531c3c5 100644
--- a/gen/python/services/tasks_svc/v1/task_template_svc_pb2_grpc.py
+++ b/gen/python/services/tasks_svc/v1/task_template_svc_pb2_grpc.py
@@ -19,11 +19,6 @@ def __init__(self, channel):
                 request_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.CreateTaskTemplateRequest.SerializeToString,
                 response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.CreateTaskTemplateResponse.FromString,
                 _registered_method=True)
-        self.GetAllTaskTemplates = channel.unary_unary(
-                '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplates',
-                request_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesRequest.SerializeToString,
-                response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesResponse.FromString,
-                _registered_method=True)
         self.DeleteTaskTemplate = channel.unary_unary(
                 '/services.tasks_svc.v1.TaskTemplateService/DeleteTaskTemplate',
                 request_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.DeleteTaskTemplateRequest.SerializeToString,
@@ -49,15 +44,10 @@ def __init__(self, channel):
                 request_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.CreateTaskTemplateSubTaskRequest.SerializeToString,
                 response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.CreateTaskTemplateSubTaskResponse.FromString,
                 _registered_method=True)
-        self.GetAllTaskTemplatesByCreator = channel.unary_unary(
-                '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplatesByCreator',
-                request_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByCreatorRequest.SerializeToString,
-                response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByCreatorResponse.FromString,
-                _registered_method=True)
-        self.GetAllTaskTemplatesByWard = channel.unary_unary(
-                '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplatesByWard',
-                request_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByWardRequest.SerializeToString,
-                response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByWardResponse.FromString,
+        self.GetAllTaskTemplates = channel.unary_unary(
+                '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplates',
+                request_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesRequest.SerializeToString,
+                response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesResponse.FromString,
                 _registered_method=True)
 
 
@@ -70,12 +60,6 @@ def CreateTaskTemplate(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def GetAllTaskTemplates(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
     def DeleteTaskTemplate(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -106,13 +90,7 @@ def CreateTaskTemplateSubTask(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def GetAllTaskTemplatesByCreator(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def GetAllTaskTemplatesByWard(self, request, context):
+    def GetAllTaskTemplates(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
@@ -126,11 +104,6 @@ def add_TaskTemplateServiceServicer_to_server(servicer, server):
                     request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.CreateTaskTemplateRequest.FromString,
                     response_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.CreateTaskTemplateResponse.SerializeToString,
             ),
-            'GetAllTaskTemplates': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetAllTaskTemplates,
-                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesRequest.FromString,
-                    response_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesResponse.SerializeToString,
-            ),
             'DeleteTaskTemplate': grpc.unary_unary_rpc_method_handler(
                     servicer.DeleteTaskTemplate,
                     request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.DeleteTaskTemplateRequest.FromString,
@@ -156,15 +129,10 @@ def add_TaskTemplateServiceServicer_to_server(servicer, server):
                     request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.CreateTaskTemplateSubTaskRequest.FromString,
                     response_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.CreateTaskTemplateSubTaskResponse.SerializeToString,
             ),
-            'GetAllTaskTemplatesByCreator': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetAllTaskTemplatesByCreator,
-                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByCreatorRequest.FromString,
-                    response_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByCreatorResponse.SerializeToString,
-            ),
-            'GetAllTaskTemplatesByWard': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetAllTaskTemplatesByWard,
-                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByWardRequest.FromString,
-                    response_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByWardResponse.SerializeToString,
+            'GetAllTaskTemplates': grpc.unary_unary_rpc_method_handler(
+                    servicer.GetAllTaskTemplates,
+                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesRequest.FromString,
+                    response_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesResponse.SerializeToString,
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
@@ -204,33 +172,6 @@ def CreateTaskTemplate(request,
             metadata,
             _registered_method=True)
 
-    @staticmethod
-    def GetAllTaskTemplates(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplates',
-            services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesRequest.SerializeToString,
-            services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
     @staticmethod
     def DeleteTaskTemplate(request,
             target,
@@ -367,34 +308,7 @@ def CreateTaskTemplateSubTask(request,
             _registered_method=True)
 
     @staticmethod
-    def GetAllTaskTemplatesByCreator(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplatesByCreator',
-            services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByCreatorRequest.SerializeToString,
-            services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByCreatorResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def GetAllTaskTemplatesByWard(request,
+    def GetAllTaskTemplates(request,
             target,
             options=(),
             channel_credentials=None,
@@ -407,9 +321,9 @@ def GetAllTaskTemplatesByWard(request,
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplatesByWard',
-            services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByWardRequest.SerializeToString,
-            services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByWardResponse.FromString,
+            '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplates',
+            services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesRequest.SerializeToString,
+            services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesResponse.FromString,
             options,
             channel_credentials,
             insecure,
diff --git a/gen/ts/services/tasks_svc/v1/patient_svc_grpc_web_pb.d.ts b/gen/ts/services/tasks_svc/v1/patient_svc_grpc_web_pb.d.ts
index 7e31255b7..4f3e20256 100644
--- a/gen/ts/services/tasks_svc/v1/patient_svc_grpc_web_pb.d.ts
+++ b/gen/ts/services/tasks_svc/v1/patient_svc_grpc_web_pb.d.ts
@@ -99,6 +99,13 @@ export class PatientServiceClient {
                response: services_tasks_svc_v1_patient_svc_pb.ReadmitPatientResponse) => void
   ): grpcWeb.ClientReadableStream<services_tasks_svc_v1_patient_svc_pb.ReadmitPatientResponse>;
 
+  deletePatient(
+    request: services_tasks_svc_v1_patient_svc_pb.DeletePatientRequest,
+    metadata: grpcWeb.Metadata | undefined,
+    callback: (err: grpcWeb.RpcError,
+               response: services_tasks_svc_v1_patient_svc_pb.DeletePatientResponse) => void
+  ): grpcWeb.ClientReadableStream<services_tasks_svc_v1_patient_svc_pb.DeletePatientResponse>;
+
 }
 
 export class PatientServicePromiseClient {
@@ -171,5 +178,10 @@ export class PatientServicePromiseClient {
     metadata?: grpcWeb.Metadata
   ): Promise<services_tasks_svc_v1_patient_svc_pb.ReadmitPatientResponse>;
 
+  deletePatient(
+    request: services_tasks_svc_v1_patient_svc_pb.DeletePatientRequest,
+    metadata?: grpcWeb.Metadata
+  ): Promise<services_tasks_svc_v1_patient_svc_pb.DeletePatientResponse>;
+
 }
 
diff --git a/gen/ts/services/tasks_svc/v1/patient_svc_grpc_web_pb.js b/gen/ts/services/tasks_svc/v1/patient_svc_grpc_web_pb.js
index 870848c9d..9818513f0 100644
--- a/gen/ts/services/tasks_svc/v1/patient_svc_grpc_web_pb.js
+++ b/gen/ts/services/tasks_svc/v1/patient_svc_grpc_web_pb.js
@@ -871,5 +871,66 @@ proto.services.tasks_svc.v1.PatientServicePromiseClient.prototype.readmitPatient
 };
 
 
+/**
+ * @const
+ * @type {!grpc.web.MethodDescriptor<
+ *   !proto.services.tasks_svc.v1.DeletePatientRequest,
+ *   !proto.services.tasks_svc.v1.DeletePatientResponse>}
+ */
+const methodDescriptor_PatientService_DeletePatient = new grpc.web.MethodDescriptor(
+  '/services.tasks_svc.v1.PatientService/DeletePatient',
+  grpc.web.MethodType.UNARY,
+  proto.services.tasks_svc.v1.DeletePatientRequest,
+  proto.services.tasks_svc.v1.DeletePatientResponse,
+  /**
+   * @param {!proto.services.tasks_svc.v1.DeletePatientRequest} request
+   * @return {!Uint8Array}
+   */
+  function(request) {
+    return request.serializeBinary();
+  },
+  proto.services.tasks_svc.v1.DeletePatientResponse.deserializeBinary
+);
+
+
+/**
+ * @param {!proto.services.tasks_svc.v1.DeletePatientRequest} request The
+ *     request proto
+ * @param {?Object<string, string>} metadata User defined
+ *     call metadata
+ * @param {function(?grpc.web.RpcError, ?proto.services.tasks_svc.v1.DeletePatientResponse)}
+ *     callback The callback function(error, response)
+ * @return {!grpc.web.ClientReadableStream<!proto.services.tasks_svc.v1.DeletePatientResponse>|undefined}
+ *     The XHR Node Readable Stream
+ */
+proto.services.tasks_svc.v1.PatientServiceClient.prototype.deletePatient =
+    function(request, metadata, callback) {
+  return this.client_.rpcCall(this.hostname_ +
+      '/services.tasks_svc.v1.PatientService/DeletePatient',
+      request,
+      metadata || {},
+      methodDescriptor_PatientService_DeletePatient,
+      callback);
+};
+
+
+/**
+ * @param {!proto.services.tasks_svc.v1.DeletePatientRequest} request The
+ *     request proto
+ * @param {?Object<string, string>=} metadata User defined
+ *     call metadata
+ * @return {!Promise<!proto.services.tasks_svc.v1.DeletePatientResponse>}
+ *     Promise that resolves to the response
+ */
+proto.services.tasks_svc.v1.PatientServicePromiseClient.prototype.deletePatient =
+    function(request, metadata) {
+  return this.client_.unaryCall(this.hostname_ +
+      '/services.tasks_svc.v1.PatientService/DeletePatient',
+      request,
+      metadata || {},
+      methodDescriptor_PatientService_DeletePatient);
+};
+
+
 module.exports = proto.services.tasks_svc.v1;
 
diff --git a/gen/ts/services/tasks_svc/v1/patient_svc_pb.d.ts b/gen/ts/services/tasks_svc/v1/patient_svc_pb.d.ts
index fe0a3ae5b..ff950aab9 100644
--- a/gen/ts/services/tasks_svc/v1/patient_svc_pb.d.ts
+++ b/gen/ts/services/tasks_svc/v1/patient_svc_pb.d.ts
@@ -1192,3 +1192,35 @@ export namespace ReadmitPatientResponse {
   }
 }
 
+export class DeletePatientRequest extends jspb.Message {
+  getId(): string;
+  setId(value: string): DeletePatientRequest;
+
+  serializeBinary(): Uint8Array;
+  toObject(includeInstance?: boolean): DeletePatientRequest.AsObject;
+  static toObject(includeInstance: boolean, msg: DeletePatientRequest): DeletePatientRequest.AsObject;
+  static serializeBinaryToWriter(message: DeletePatientRequest, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): DeletePatientRequest;
+  static deserializeBinaryFromReader(message: DeletePatientRequest, reader: jspb.BinaryReader): DeletePatientRequest;
+}
+
+export namespace DeletePatientRequest {
+  export type AsObject = {
+    id: string,
+  }
+}
+
+export class DeletePatientResponse extends jspb.Message {
+  serializeBinary(): Uint8Array;
+  toObject(includeInstance?: boolean): DeletePatientResponse.AsObject;
+  static toObject(includeInstance: boolean, msg: DeletePatientResponse): DeletePatientResponse.AsObject;
+  static serializeBinaryToWriter(message: DeletePatientResponse, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): DeletePatientResponse;
+  static deserializeBinaryFromReader(message: DeletePatientResponse, reader: jspb.BinaryReader): DeletePatientResponse;
+}
+
+export namespace DeletePatientResponse {
+  export type AsObject = {
+  }
+}
+
diff --git a/gen/ts/services/tasks_svc/v1/patient_svc_pb.js b/gen/ts/services/tasks_svc/v1/patient_svc_pb.js
index 1f0132a3e..4377bba41 100644
--- a/gen/ts/services/tasks_svc/v1/patient_svc_pb.js
+++ b/gen/ts/services/tasks_svc/v1/patient_svc_pb.js
@@ -27,6 +27,8 @@ goog.exportSymbol('proto.services.tasks_svc.v1.AssignBedRequest', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.AssignBedResponse', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.CreatePatientRequest', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.CreatePatientResponse', null, global);
+goog.exportSymbol('proto.services.tasks_svc.v1.DeletePatientRequest', null, global);
+goog.exportSymbol('proto.services.tasks_svc.v1.DeletePatientResponse', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.DischargePatientRequest', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.DischargePatientResponse', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetPatientAssignmentByWardRequest', null, global);
@@ -991,6 +993,48 @@ if (goog.DEBUG && !COMPILED) {
    */
   proto.services.tasks_svc.v1.ReadmitPatientResponse.displayName = 'proto.services.tasks_svc.v1.ReadmitPatientResponse';
 }
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.services.tasks_svc.v1.DeletePatientRequest = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.services.tasks_svc.v1.DeletePatientRequest, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.services.tasks_svc.v1.DeletePatientRequest.displayName = 'proto.services.tasks_svc.v1.DeletePatientRequest';
+}
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.services.tasks_svc.v1.DeletePatientResponse = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.services.tasks_svc.v1.DeletePatientResponse, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.services.tasks_svc.v1.DeletePatientResponse.displayName = 'proto.services.tasks_svc.v1.DeletePatientResponse';
+}
 
 
 
@@ -9232,4 +9276,235 @@ proto.services.tasks_svc.v1.ReadmitPatientResponse.serializeBinaryToWriter = fun
 };
 
 
+
+
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.services.tasks_svc.v1.DeletePatientRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.DeletePatientRequest.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.services.tasks_svc.v1.DeletePatientRequest} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.services.tasks_svc.v1.DeletePatientRequest.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    id: jspb.Message.getFieldWithDefault(msg, 1, "")
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.services.tasks_svc.v1.DeletePatientRequest}
+ */
+proto.services.tasks_svc.v1.DeletePatientRequest.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.services.tasks_svc.v1.DeletePatientRequest;
+  return proto.services.tasks_svc.v1.DeletePatientRequest.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.services.tasks_svc.v1.DeletePatientRequest} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.services.tasks_svc.v1.DeletePatientRequest}
+ */
+proto.services.tasks_svc.v1.DeletePatientRequest.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setId(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.services.tasks_svc.v1.DeletePatientRequest.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.services.tasks_svc.v1.DeletePatientRequest.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+
+
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.services.tasks_svc.v1.DeletePatientRequest} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.services.tasks_svc.v1.DeletePatientRequest.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getId();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
+};
+
+
+/**
+ * optional string id = 1;
+ * @return {string}
+ */
+proto.services.tasks_svc.v1.DeletePatientRequest.prototype.getId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.services.tasks_svc.v1.DeletePatientRequest} returns this
+ */
+proto.services.tasks_svc.v1.DeletePatientRequest.prototype.setId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
+};
+
+
+
+
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.services.tasks_svc.v1.DeletePatientResponse.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.DeletePatientResponse.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.services.tasks_svc.v1.DeletePatientResponse} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.services.tasks_svc.v1.DeletePatientResponse.toObject = function(includeInstance, msg) {
+  var f, obj = {
+
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.services.tasks_svc.v1.DeletePatientResponse}
+ */
+proto.services.tasks_svc.v1.DeletePatientResponse.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.services.tasks_svc.v1.DeletePatientResponse;
+  return proto.services.tasks_svc.v1.DeletePatientResponse.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.services.tasks_svc.v1.DeletePatientResponse} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.services.tasks_svc.v1.DeletePatientResponse}
+ */
+proto.services.tasks_svc.v1.DeletePatientResponse.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.services.tasks_svc.v1.DeletePatientResponse.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.services.tasks_svc.v1.DeletePatientResponse.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+
+
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.services.tasks_svc.v1.DeletePatientResponse} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.services.tasks_svc.v1.DeletePatientResponse.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+};
+
+
 goog.object.extend(exports, proto.services.tasks_svc.v1);
diff --git a/gen/ts/services/tasks_svc/v1/room_svc_grpc_web_pb.d.ts b/gen/ts/services/tasks_svc/v1/room_svc_grpc_web_pb.d.ts
index d39b78fed..d491f5834 100644
--- a/gen/ts/services/tasks_svc/v1/room_svc_grpc_web_pb.d.ts
+++ b/gen/ts/services/tasks_svc/v1/room_svc_grpc_web_pb.d.ts
@@ -29,13 +29,6 @@ export class RoomServiceClient {
                response: services_tasks_svc_v1_room_svc_pb.GetRoomsResponse) => void
   ): grpcWeb.ClientReadableStream<services_tasks_svc_v1_room_svc_pb.GetRoomsResponse>;
 
-  getRoomsByWard(
-    request: services_tasks_svc_v1_room_svc_pb.GetRoomsByWardRequest,
-    metadata: grpcWeb.Metadata | undefined,
-    callback: (err: grpcWeb.RpcError,
-               response: services_tasks_svc_v1_room_svc_pb.GetRoomsByWardResponse) => void
-  ): grpcWeb.ClientReadableStream<services_tasks_svc_v1_room_svc_pb.GetRoomsByWardResponse>;
-
   updateRoom(
     request: services_tasks_svc_v1_room_svc_pb.UpdateRoomRequest,
     metadata: grpcWeb.Metadata | undefined,
@@ -79,11 +72,6 @@ export class RoomServicePromiseClient {
     metadata?: grpcWeb.Metadata
   ): Promise<services_tasks_svc_v1_room_svc_pb.GetRoomsResponse>;
 
-  getRoomsByWard(
-    request: services_tasks_svc_v1_room_svc_pb.GetRoomsByWardRequest,
-    metadata?: grpcWeb.Metadata
-  ): Promise<services_tasks_svc_v1_room_svc_pb.GetRoomsByWardResponse>;
-
   updateRoom(
     request: services_tasks_svc_v1_room_svc_pb.UpdateRoomRequest,
     metadata?: grpcWeb.Metadata
diff --git a/gen/ts/services/tasks_svc/v1/room_svc_grpc_web_pb.js b/gen/ts/services/tasks_svc/v1/room_svc_grpc_web_pb.js
index 861a69e33..bd72bd401 100644
--- a/gen/ts/services/tasks_svc/v1/room_svc_grpc_web_pb.js
+++ b/gen/ts/services/tasks_svc/v1/room_svc_grpc_web_pb.js
@@ -259,67 +259,6 @@ proto.services.tasks_svc.v1.RoomServicePromiseClient.prototype.getRooms =
 };
 
 
-/**
- * @const
- * @type {!grpc.web.MethodDescriptor<
- *   !proto.services.tasks_svc.v1.GetRoomsByWardRequest,
- *   !proto.services.tasks_svc.v1.GetRoomsByWardResponse>}
- */
-const methodDescriptor_RoomService_GetRoomsByWard = new grpc.web.MethodDescriptor(
-  '/services.tasks_svc.v1.RoomService/GetRoomsByWard',
-  grpc.web.MethodType.UNARY,
-  proto.services.tasks_svc.v1.GetRoomsByWardRequest,
-  proto.services.tasks_svc.v1.GetRoomsByWardResponse,
-  /**
-   * @param {!proto.services.tasks_svc.v1.GetRoomsByWardRequest} request
-   * @return {!Uint8Array}
-   */
-  function(request) {
-    return request.serializeBinary();
-  },
-  proto.services.tasks_svc.v1.GetRoomsByWardResponse.deserializeBinary
-);
-
-
-/**
- * @param {!proto.services.tasks_svc.v1.GetRoomsByWardRequest} request The
- *     request proto
- * @param {?Object<string, string>} metadata User defined
- *     call metadata
- * @param {function(?grpc.web.RpcError, ?proto.services.tasks_svc.v1.GetRoomsByWardResponse)}
- *     callback The callback function(error, response)
- * @return {!grpc.web.ClientReadableStream<!proto.services.tasks_svc.v1.GetRoomsByWardResponse>|undefined}
- *     The XHR Node Readable Stream
- */
-proto.services.tasks_svc.v1.RoomServiceClient.prototype.getRoomsByWard =
-    function(request, metadata, callback) {
-  return this.client_.rpcCall(this.hostname_ +
-      '/services.tasks_svc.v1.RoomService/GetRoomsByWard',
-      request,
-      metadata || {},
-      methodDescriptor_RoomService_GetRoomsByWard,
-      callback);
-};
-
-
-/**
- * @param {!proto.services.tasks_svc.v1.GetRoomsByWardRequest} request The
- *     request proto
- * @param {?Object<string, string>=} metadata User defined
- *     call metadata
- * @return {!Promise<!proto.services.tasks_svc.v1.GetRoomsByWardResponse>}
- *     Promise that resolves to the response
- */
-proto.services.tasks_svc.v1.RoomServicePromiseClient.prototype.getRoomsByWard =
-    function(request, metadata) {
-  return this.client_.unaryCall(this.hostname_ +
-      '/services.tasks_svc.v1.RoomService/GetRoomsByWard',
-      request,
-      metadata || {},
-      methodDescriptor_RoomService_GetRoomsByWard);
-};
-
-
 /**
  * @const
  * @type {!grpc.web.MethodDescriptor<
diff --git a/gen/ts/services/tasks_svc/v1/room_svc_pb.d.ts b/gen/ts/services/tasks_svc/v1/room_svc_pb.d.ts
index a196041f3..ef21440b5 100644
--- a/gen/ts/services/tasks_svc/v1/room_svc_pb.d.ts
+++ b/gen/ts/services/tasks_svc/v1/room_svc_pb.d.ts
@@ -116,6 +116,11 @@ export namespace GetRoomResponse {
 }
 
 export class GetRoomsRequest extends jspb.Message {
+  getWardId(): string;
+  setWardId(value: string): GetRoomsRequest;
+  hasWardId(): boolean;
+  clearWardId(): GetRoomsRequest;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): GetRoomsRequest.AsObject;
   static toObject(includeInstance: boolean, msg: GetRoomsRequest): GetRoomsRequest.AsObject;
@@ -126,6 +131,12 @@ export class GetRoomsRequest extends jspb.Message {
 
 export namespace GetRoomsRequest {
   export type AsObject = {
+    wardId?: string,
+  }
+
+  export enum WardIdCase { 
+    _WARD_ID_NOT_SET = 0,
+    WARD_ID = 1,
   }
 }
 
@@ -205,100 +216,6 @@ export namespace GetRoomsResponse {
 
 }
 
-export class GetRoomsByWardRequest extends jspb.Message {
-  getWardId(): string;
-  setWardId(value: string): GetRoomsByWardRequest;
-
-  serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): GetRoomsByWardRequest.AsObject;
-  static toObject(includeInstance: boolean, msg: GetRoomsByWardRequest): GetRoomsByWardRequest.AsObject;
-  static serializeBinaryToWriter(message: GetRoomsByWardRequest, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): GetRoomsByWardRequest;
-  static deserializeBinaryFromReader(message: GetRoomsByWardRequest, reader: jspb.BinaryReader): GetRoomsByWardRequest;
-}
-
-export namespace GetRoomsByWardRequest {
-  export type AsObject = {
-    wardId: string,
-  }
-}
-
-export class GetRoomsByWardResponse extends jspb.Message {
-  getRoomsList(): Array<GetRoomsByWardResponse.Room>;
-  setRoomsList(value: Array<GetRoomsByWardResponse.Room>): GetRoomsByWardResponse;
-  clearRoomsList(): GetRoomsByWardResponse;
-  addRooms(value?: GetRoomsByWardResponse.Room, index?: number): GetRoomsByWardResponse.Room;
-
-  serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): GetRoomsByWardResponse.AsObject;
-  static toObject(includeInstance: boolean, msg: GetRoomsByWardResponse): GetRoomsByWardResponse.AsObject;
-  static serializeBinaryToWriter(message: GetRoomsByWardResponse, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): GetRoomsByWardResponse;
-  static deserializeBinaryFromReader(message: GetRoomsByWardResponse, reader: jspb.BinaryReader): GetRoomsByWardResponse;
-}
-
-export namespace GetRoomsByWardResponse {
-  export type AsObject = {
-    roomsList: Array<GetRoomsByWardResponse.Room.AsObject>,
-  }
-
-  export class Room extends jspb.Message {
-    getId(): string;
-    setId(value: string): Room;
-
-    getName(): string;
-    setName(value: string): Room;
-
-    getBedsList(): Array<GetRoomsByWardResponse.Room.Bed>;
-    setBedsList(value: Array<GetRoomsByWardResponse.Room.Bed>): Room;
-    clearBedsList(): Room;
-    addBeds(value?: GetRoomsByWardResponse.Room.Bed, index?: number): GetRoomsByWardResponse.Room.Bed;
-
-    getWardId(): string;
-    setWardId(value: string): Room;
-
-    serializeBinary(): Uint8Array;
-    toObject(includeInstance?: boolean): Room.AsObject;
-    static toObject(includeInstance: boolean, msg: Room): Room.AsObject;
-    static serializeBinaryToWriter(message: Room, writer: jspb.BinaryWriter): void;
-    static deserializeBinary(bytes: Uint8Array): Room;
-    static deserializeBinaryFromReader(message: Room, reader: jspb.BinaryReader): Room;
-  }
-
-  export namespace Room {
-    export type AsObject = {
-      id: string,
-      name: string,
-      bedsList: Array<GetRoomsByWardResponse.Room.Bed.AsObject>,
-      wardId: string,
-    }
-
-    export class Bed extends jspb.Message {
-      getId(): string;
-      setId(value: string): Bed;
-
-      getName(): string;
-      setName(value: string): Bed;
-
-      serializeBinary(): Uint8Array;
-      toObject(includeInstance?: boolean): Bed.AsObject;
-      static toObject(includeInstance: boolean, msg: Bed): Bed.AsObject;
-      static serializeBinaryToWriter(message: Bed, writer: jspb.BinaryWriter): void;
-      static deserializeBinary(bytes: Uint8Array): Bed;
-      static deserializeBinaryFromReader(message: Bed, reader: jspb.BinaryReader): Bed;
-    }
-
-    export namespace Bed {
-      export type AsObject = {
-        id: string,
-        name: string,
-      }
-    }
-
-  }
-
-}
-
 export class UpdateRoomRequest extends jspb.Message {
   getId(): string;
   setId(value: string): UpdateRoomRequest;
diff --git a/gen/ts/services/tasks_svc/v1/room_svc_pb.js b/gen/ts/services/tasks_svc/v1/room_svc_pb.js
index 714486d8e..17d6d9dcb 100644
--- a/gen/ts/services/tasks_svc/v1/room_svc_pb.js
+++ b/gen/ts/services/tasks_svc/v1/room_svc_pb.js
@@ -33,10 +33,6 @@ goog.exportSymbol('proto.services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Ro
 goog.exportSymbol('proto.services.tasks_svc.v1.GetRoomRequest', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetRoomResponse', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetRoomResponse.Bed', null, global);
-goog.exportSymbol('proto.services.tasks_svc.v1.GetRoomsByWardRequest', null, global);
-goog.exportSymbol('proto.services.tasks_svc.v1.GetRoomsByWardResponse', null, global);
-goog.exportSymbol('proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room', null, global);
-goog.exportSymbol('proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetRoomsRequest', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetRoomsResponse', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetRoomsResponse.Room', null, global);
@@ -232,90 +228,6 @@ if (goog.DEBUG && !COMPILED) {
    */
   proto.services.tasks_svc.v1.GetRoomsResponse.Room.Bed.displayName = 'proto.services.tasks_svc.v1.GetRoomsResponse.Room.Bed';
 }
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.services.tasks_svc.v1.GetRoomsByWardRequest = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.services.tasks_svc.v1.GetRoomsByWardRequest, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  /**
-   * @public
-   * @override
-   */
-  proto.services.tasks_svc.v1.GetRoomsByWardRequest.displayName = 'proto.services.tasks_svc.v1.GetRoomsByWardRequest';
-}
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.services.tasks_svc.v1.GetRoomsByWardResponse.repeatedFields_, null);
-};
-goog.inherits(proto.services.tasks_svc.v1.GetRoomsByWardResponse, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  /**
-   * @public
-   * @override
-   */
-  proto.services.tasks_svc.v1.GetRoomsByWardResponse.displayName = 'proto.services.tasks_svc.v1.GetRoomsByWardResponse';
-}
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.repeatedFields_, null);
-};
-goog.inherits(proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  /**
-   * @public
-   * @override
-   */
-  proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.displayName = 'proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room';
-}
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  /**
-   * @public
-   * @override
-   */
-  proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed.displayName = 'proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed';
-}
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -1367,7 +1279,7 @@ proto.services.tasks_svc.v1.GetRoomsRequest.prototype.toObject = function(opt_in
  */
 proto.services.tasks_svc.v1.GetRoomsRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
-
+    wardId: jspb.Message.getFieldWithDefault(msg, 1, "")
   };
 
   if (includeInstance) {
@@ -1404,6 +1316,10 @@ proto.services.tasks_svc.v1.GetRoomsRequest.deserializeBinaryFromReader = functi
     }
     var field = reader.getFieldNumber();
     switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setWardId(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -1433,6 +1349,49 @@ proto.services.tasks_svc.v1.GetRoomsRequest.prototype.serializeBinary = function
  */
 proto.services.tasks_svc.v1.GetRoomsRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
+  f = /** @type {string} */ (jspb.Message.getField(message, 1));
+  if (f != null) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
+};
+
+
+/**
+ * optional string ward_id = 1;
+ * @return {string}
+ */
+proto.services.tasks_svc.v1.GetRoomsRequest.prototype.getWardId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.services.tasks_svc.v1.GetRoomsRequest} returns this
+ */
+proto.services.tasks_svc.v1.GetRoomsRequest.prototype.setWardId = function(value) {
+  return jspb.Message.setField(this, 1, value);
+};
+
+
+/**
+ * Clears the field making it undefined.
+ * @return {!proto.services.tasks_svc.v1.GetRoomsRequest} returns this
+ */
+proto.services.tasks_svc.v1.GetRoomsRequest.prototype.clearWardId = function() {
+  return jspb.Message.setField(this, 1, undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.services.tasks_svc.v1.GetRoomsRequest.prototype.hasWardId = function() {
+  return jspb.Message.getField(this, 1) != null;
 };
 
 
@@ -2009,706 +1968,6 @@ proto.services.tasks_svc.v1.GetRoomsResponse.prototype.clearRoomsList = function
 
 
 
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * Optional fields that are not set will be set to undefined.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
- * @param {boolean=} opt_includeInstance Deprecated. whether to include the
- *     JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.GetRoomsByWardRequest.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Deprecated. Whether to include
- *     the JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.GetRoomsByWardRequest} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.GetRoomsByWardRequest.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    wardId: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardRequest}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardRequest.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.GetRoomsByWardRequest;
-  return proto.services.tasks_svc.v1.GetRoomsByWardRequest.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.GetRoomsByWardRequest} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardRequest}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardRequest.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setWardId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardRequest.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.GetRoomsByWardRequest.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.GetRoomsByWardRequest} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.GetRoomsByWardRequest.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getWardId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string ward_id = 1;
- * @return {string}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardRequest.prototype.getWardId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardRequest} returns this
- */
-proto.services.tasks_svc.v1.GetRoomsByWardRequest.prototype.setWardId = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
-};
-
-
-
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.repeatedFields_ = [1];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * Optional fields that are not set will be set to undefined.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
- * @param {boolean=} opt_includeInstance Deprecated. whether to include the
- *     JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.GetRoomsByWardResponse.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Deprecated. Whether to include
- *     the JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.GetRoomsByWardResponse} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    roomsList: jspb.Message.toObjectList(msg.getRoomsList(),
-    proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardResponse}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.GetRoomsByWardResponse;
-  return proto.services.tasks_svc.v1.GetRoomsByWardResponse.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.GetRoomsByWardResponse} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardResponse}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room;
-      reader.readMessage(value,proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.deserializeBinaryFromReader);
-      msg.addRooms(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.GetRoomsByWardResponse.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.GetRoomsByWardResponse} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getRoomsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.serializeBinaryToWriter
-    );
-  }
-};
-
-
-
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.repeatedFields_ = [3];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * Optional fields that are not set will be set to undefined.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
- * @param {boolean=} opt_includeInstance Deprecated. whether to include the
- *     JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Deprecated. Whether to include
- *     the JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    name: jspb.Message.getFieldWithDefault(msg, 2, ""),
-    bedsList: jspb.Message.toObjectList(msg.getBedsList(),
-    proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed.toObject, includeInstance),
-    wardId: jspb.Message.getFieldWithDefault(msg, 5, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room;
-  return proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setName(value);
-      break;
-    case 3:
-      var value = new proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed;
-      reader.readMessage(value,proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed.deserializeBinaryFromReader);
-      msg.addBeds(value);
-      break;
-    case 5:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setWardId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getName();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-  f = message.getBedsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      3,
-      f,
-      proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed.serializeBinaryToWriter
-    );
-  }
-  f = message.getWardId();
-  if (f.length > 0) {
-    writer.writeString(
-      5,
-      f
-    );
-  }
-};
-
-
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * Optional fields that are not set will be set to undefined.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
- * @param {boolean=} opt_includeInstance Deprecated. whether to include the
- *     JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Deprecated. Whether to include
- *     the JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    name: jspb.Message.getFieldWithDefault(msg, 2, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed;
-  return proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setName(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getName();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed} returns this
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed.prototype.setId = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
-};
-
-
-/**
- * optional string name = 2;
- * @return {string}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed.prototype.getName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed} returns this
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed.prototype.setName = function(value) {
-  return jspb.Message.setProto3StringField(this, 2, value);
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room} returns this
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.prototype.setId = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
-};
-
-
-/**
- * optional string name = 2;
- * @return {string}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.prototype.getName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room} returns this
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.prototype.setName = function(value) {
-  return jspb.Message.setProto3StringField(this, 2, value);
-};
-
-
-/**
- * repeated Bed beds = 3;
- * @return {!Array<!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed>}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.prototype.getBedsList = function() {
-  return /** @type{!Array<!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed, 3));
-};
-
-
-/**
- * @param {!Array<!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed>} value
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room} returns this
-*/
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.prototype.setBedsList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 3, value);
-};
-
-
-/**
- * @param {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed=} opt_value
- * @param {number=} opt_index
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.prototype.addBeds = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 3, opt_value, proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.Bed, opt_index);
-};
-
-
-/**
- * Clears the list making it empty but non-null.
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room} returns this
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.prototype.clearBedsList = function() {
-  return this.setBedsList([]);
-};
-
-
-/**
- * optional string ward_id = 5;
- * @return {string}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.prototype.getWardId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room} returns this
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room.prototype.setWardId = function(value) {
-  return jspb.Message.setProto3StringField(this, 5, value);
-};
-
-
-/**
- * repeated Room rooms = 1;
- * @return {!Array<!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room>}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.prototype.getRoomsList = function() {
-  return /** @type{!Array<!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room, 1));
-};
-
-
-/**
- * @param {!Array<!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room>} value
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardResponse} returns this
-*/
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.prototype.setRoomsList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 1, value);
-};
-
-
-/**
- * @param {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room=} opt_value
- * @param {number=} opt_index
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room}
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.prototype.addRooms = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.services.tasks_svc.v1.GetRoomsByWardResponse.Room, opt_index);
-};
-
-
-/**
- * Clears the list making it empty but non-null.
- * @return {!proto.services.tasks_svc.v1.GetRoomsByWardResponse} returns this
- */
-proto.services.tasks_svc.v1.GetRoomsByWardResponse.prototype.clearRoomsList = function() {
-  return this.setRoomsList([]);
-};
-
-
-
-
-
 if (jspb.Message.GENERATE_TO_OBJECT) {
 /**
  * Creates an object representation of this proto.
diff --git a/gen/ts/services/tasks_svc/v1/task_svc_grpc_web_pb.d.ts b/gen/ts/services/tasks_svc/v1/task_svc_grpc_web_pb.d.ts
index fe8564119..a121bbae7 100644
--- a/gen/ts/services/tasks_svc/v1/task_svc_grpc_web_pb.d.ts
+++ b/gen/ts/services/tasks_svc/v1/task_svc_grpc_web_pb.d.ts
@@ -78,26 +78,26 @@ export class TaskServiceClient {
                response: services_tasks_svc_v1_task_svc_pb.UpdateSubtaskResponse) => void
   ): grpcWeb.ClientReadableStream<services_tasks_svc_v1_task_svc_pb.UpdateSubtaskResponse>;
 
-  completeSubtask(
-    request: services_tasks_svc_v1_task_svc_pb.CompleteSubtaskRequest,
+  deleteSubtask(
+    request: services_tasks_svc_v1_task_svc_pb.DeleteSubtaskRequest,
     metadata: grpcWeb.Metadata | undefined,
     callback: (err: grpcWeb.RpcError,
-               response: services_tasks_svc_v1_task_svc_pb.CompleteSubtaskResponse) => void
-  ): grpcWeb.ClientReadableStream<services_tasks_svc_v1_task_svc_pb.CompleteSubtaskResponse>;
+               response: services_tasks_svc_v1_task_svc_pb.DeleteSubtaskResponse) => void
+  ): grpcWeb.ClientReadableStream<services_tasks_svc_v1_task_svc_pb.DeleteSubtaskResponse>;
 
-  uncompleteSubtask(
-    request: services_tasks_svc_v1_task_svc_pb.UncompleteSubtaskRequest,
+  removeTaskDueDate(
+    request: services_tasks_svc_v1_task_svc_pb.RemoveTaskDueDateRequest,
     metadata: grpcWeb.Metadata | undefined,
     callback: (err: grpcWeb.RpcError,
-               response: services_tasks_svc_v1_task_svc_pb.UncompleteSubtaskResponse) => void
-  ): grpcWeb.ClientReadableStream<services_tasks_svc_v1_task_svc_pb.UncompleteSubtaskResponse>;
+               response: services_tasks_svc_v1_task_svc_pb.RemoveTaskDueDateResponse) => void
+  ): grpcWeb.ClientReadableStream<services_tasks_svc_v1_task_svc_pb.RemoveTaskDueDateResponse>;
 
-  deleteSubtask(
-    request: services_tasks_svc_v1_task_svc_pb.DeleteSubtaskRequest,
+  deleteTask(
+    request: services_tasks_svc_v1_task_svc_pb.DeleteTaskRequest,
     metadata: grpcWeb.Metadata | undefined,
     callback: (err: grpcWeb.RpcError,
-               response: services_tasks_svc_v1_task_svc_pb.DeleteSubtaskResponse) => void
-  ): grpcWeb.ClientReadableStream<services_tasks_svc_v1_task_svc_pb.DeleteSubtaskResponse>;
+               response: services_tasks_svc_v1_task_svc_pb.DeleteTaskResponse) => void
+  ): grpcWeb.ClientReadableStream<services_tasks_svc_v1_task_svc_pb.DeleteTaskResponse>;
 
 }
 
@@ -156,20 +156,20 @@ export class TaskServicePromiseClient {
     metadata?: grpcWeb.Metadata
   ): Promise<services_tasks_svc_v1_task_svc_pb.UpdateSubtaskResponse>;
 
-  completeSubtask(
-    request: services_tasks_svc_v1_task_svc_pb.CompleteSubtaskRequest,
+  deleteSubtask(
+    request: services_tasks_svc_v1_task_svc_pb.DeleteSubtaskRequest,
     metadata?: grpcWeb.Metadata
-  ): Promise<services_tasks_svc_v1_task_svc_pb.CompleteSubtaskResponse>;
+  ): Promise<services_tasks_svc_v1_task_svc_pb.DeleteSubtaskResponse>;
 
-  uncompleteSubtask(
-    request: services_tasks_svc_v1_task_svc_pb.UncompleteSubtaskRequest,
+  removeTaskDueDate(
+    request: services_tasks_svc_v1_task_svc_pb.RemoveTaskDueDateRequest,
     metadata?: grpcWeb.Metadata
-  ): Promise<services_tasks_svc_v1_task_svc_pb.UncompleteSubtaskResponse>;
+  ): Promise<services_tasks_svc_v1_task_svc_pb.RemoveTaskDueDateResponse>;
 
-  deleteSubtask(
-    request: services_tasks_svc_v1_task_svc_pb.DeleteSubtaskRequest,
+  deleteTask(
+    request: services_tasks_svc_v1_task_svc_pb.DeleteTaskRequest,
     metadata?: grpcWeb.Metadata
-  ): Promise<services_tasks_svc_v1_task_svc_pb.DeleteSubtaskResponse>;
+  ): Promise<services_tasks_svc_v1_task_svc_pb.DeleteTaskResponse>;
 
 }
 
diff --git a/gen/ts/services/tasks_svc/v1/task_svc_grpc_web_pb.js b/gen/ts/services/tasks_svc/v1/task_svc_grpc_web_pb.js
index 6bf9b4552..c867f1759 100644
--- a/gen/ts/services/tasks_svc/v1/task_svc_grpc_web_pb.js
+++ b/gen/ts/services/tasks_svc/v1/task_svc_grpc_web_pb.js
@@ -693,183 +693,183 @@ proto.services.tasks_svc.v1.TaskServicePromiseClient.prototype.updateSubtask =
 /**
  * @const
  * @type {!grpc.web.MethodDescriptor<
- *   !proto.services.tasks_svc.v1.CompleteSubtaskRequest,
- *   !proto.services.tasks_svc.v1.CompleteSubtaskResponse>}
+ *   !proto.services.tasks_svc.v1.DeleteSubtaskRequest,
+ *   !proto.services.tasks_svc.v1.DeleteSubtaskResponse>}
  */
-const methodDescriptor_TaskService_CompleteSubtask = new grpc.web.MethodDescriptor(
-  '/services.tasks_svc.v1.TaskService/CompleteSubtask',
+const methodDescriptor_TaskService_DeleteSubtask = new grpc.web.MethodDescriptor(
+  '/services.tasks_svc.v1.TaskService/DeleteSubtask',
   grpc.web.MethodType.UNARY,
-  proto.services.tasks_svc.v1.CompleteSubtaskRequest,
-  proto.services.tasks_svc.v1.CompleteSubtaskResponse,
+  proto.services.tasks_svc.v1.DeleteSubtaskRequest,
+  proto.services.tasks_svc.v1.DeleteSubtaskResponse,
   /**
-   * @param {!proto.services.tasks_svc.v1.CompleteSubtaskRequest} request
+   * @param {!proto.services.tasks_svc.v1.DeleteSubtaskRequest} request
    * @return {!Uint8Array}
    */
   function(request) {
     return request.serializeBinary();
   },
-  proto.services.tasks_svc.v1.CompleteSubtaskResponse.deserializeBinary
+  proto.services.tasks_svc.v1.DeleteSubtaskResponse.deserializeBinary
 );
 
 
 /**
- * @param {!proto.services.tasks_svc.v1.CompleteSubtaskRequest} request The
+ * @param {!proto.services.tasks_svc.v1.DeleteSubtaskRequest} request The
  *     request proto
  * @param {?Object<string, string>} metadata User defined
  *     call metadata
- * @param {function(?grpc.web.RpcError, ?proto.services.tasks_svc.v1.CompleteSubtaskResponse)}
+ * @param {function(?grpc.web.RpcError, ?proto.services.tasks_svc.v1.DeleteSubtaskResponse)}
  *     callback The callback function(error, response)
- * @return {!grpc.web.ClientReadableStream<!proto.services.tasks_svc.v1.CompleteSubtaskResponse>|undefined}
+ * @return {!grpc.web.ClientReadableStream<!proto.services.tasks_svc.v1.DeleteSubtaskResponse>|undefined}
  *     The XHR Node Readable Stream
  */
-proto.services.tasks_svc.v1.TaskServiceClient.prototype.completeSubtask =
+proto.services.tasks_svc.v1.TaskServiceClient.prototype.deleteSubtask =
     function(request, metadata, callback) {
   return this.client_.rpcCall(this.hostname_ +
-      '/services.tasks_svc.v1.TaskService/CompleteSubtask',
+      '/services.tasks_svc.v1.TaskService/DeleteSubtask',
       request,
       metadata || {},
-      methodDescriptor_TaskService_CompleteSubtask,
+      methodDescriptor_TaskService_DeleteSubtask,
       callback);
 };
 
 
 /**
- * @param {!proto.services.tasks_svc.v1.CompleteSubtaskRequest} request The
+ * @param {!proto.services.tasks_svc.v1.DeleteSubtaskRequest} request The
  *     request proto
  * @param {?Object<string, string>=} metadata User defined
  *     call metadata
- * @return {!Promise<!proto.services.tasks_svc.v1.CompleteSubtaskResponse>}
+ * @return {!Promise<!proto.services.tasks_svc.v1.DeleteSubtaskResponse>}
  *     Promise that resolves to the response
  */
-proto.services.tasks_svc.v1.TaskServicePromiseClient.prototype.completeSubtask =
+proto.services.tasks_svc.v1.TaskServicePromiseClient.prototype.deleteSubtask =
     function(request, metadata) {
   return this.client_.unaryCall(this.hostname_ +
-      '/services.tasks_svc.v1.TaskService/CompleteSubtask',
+      '/services.tasks_svc.v1.TaskService/DeleteSubtask',
       request,
       metadata || {},
-      methodDescriptor_TaskService_CompleteSubtask);
+      methodDescriptor_TaskService_DeleteSubtask);
 };
 
 
 /**
  * @const
  * @type {!grpc.web.MethodDescriptor<
- *   !proto.services.tasks_svc.v1.UncompleteSubtaskRequest,
- *   !proto.services.tasks_svc.v1.UncompleteSubtaskResponse>}
+ *   !proto.services.tasks_svc.v1.RemoveTaskDueDateRequest,
+ *   !proto.services.tasks_svc.v1.RemoveTaskDueDateResponse>}
  */
-const methodDescriptor_TaskService_UncompleteSubtask = new grpc.web.MethodDescriptor(
-  '/services.tasks_svc.v1.TaskService/UncompleteSubtask',
+const methodDescriptor_TaskService_RemoveTaskDueDate = new grpc.web.MethodDescriptor(
+  '/services.tasks_svc.v1.TaskService/RemoveTaskDueDate',
   grpc.web.MethodType.UNARY,
-  proto.services.tasks_svc.v1.UncompleteSubtaskRequest,
-  proto.services.tasks_svc.v1.UncompleteSubtaskResponse,
+  proto.services.tasks_svc.v1.RemoveTaskDueDateRequest,
+  proto.services.tasks_svc.v1.RemoveTaskDueDateResponse,
   /**
-   * @param {!proto.services.tasks_svc.v1.UncompleteSubtaskRequest} request
+   * @param {!proto.services.tasks_svc.v1.RemoveTaskDueDateRequest} request
    * @return {!Uint8Array}
    */
   function(request) {
     return request.serializeBinary();
   },
-  proto.services.tasks_svc.v1.UncompleteSubtaskResponse.deserializeBinary
+  proto.services.tasks_svc.v1.RemoveTaskDueDateResponse.deserializeBinary
 );
 
 
 /**
- * @param {!proto.services.tasks_svc.v1.UncompleteSubtaskRequest} request The
+ * @param {!proto.services.tasks_svc.v1.RemoveTaskDueDateRequest} request The
  *     request proto
  * @param {?Object<string, string>} metadata User defined
  *     call metadata
- * @param {function(?grpc.web.RpcError, ?proto.services.tasks_svc.v1.UncompleteSubtaskResponse)}
+ * @param {function(?grpc.web.RpcError, ?proto.services.tasks_svc.v1.RemoveTaskDueDateResponse)}
  *     callback The callback function(error, response)
- * @return {!grpc.web.ClientReadableStream<!proto.services.tasks_svc.v1.UncompleteSubtaskResponse>|undefined}
+ * @return {!grpc.web.ClientReadableStream<!proto.services.tasks_svc.v1.RemoveTaskDueDateResponse>|undefined}
  *     The XHR Node Readable Stream
  */
-proto.services.tasks_svc.v1.TaskServiceClient.prototype.uncompleteSubtask =
+proto.services.tasks_svc.v1.TaskServiceClient.prototype.removeTaskDueDate =
     function(request, metadata, callback) {
   return this.client_.rpcCall(this.hostname_ +
-      '/services.tasks_svc.v1.TaskService/UncompleteSubtask',
+      '/services.tasks_svc.v1.TaskService/RemoveTaskDueDate',
       request,
       metadata || {},
-      methodDescriptor_TaskService_UncompleteSubtask,
+      methodDescriptor_TaskService_RemoveTaskDueDate,
       callback);
 };
 
 
 /**
- * @param {!proto.services.tasks_svc.v1.UncompleteSubtaskRequest} request The
+ * @param {!proto.services.tasks_svc.v1.RemoveTaskDueDateRequest} request The
  *     request proto
  * @param {?Object<string, string>=} metadata User defined
  *     call metadata
- * @return {!Promise<!proto.services.tasks_svc.v1.UncompleteSubtaskResponse>}
+ * @return {!Promise<!proto.services.tasks_svc.v1.RemoveTaskDueDateResponse>}
  *     Promise that resolves to the response
  */
-proto.services.tasks_svc.v1.TaskServicePromiseClient.prototype.uncompleteSubtask =
+proto.services.tasks_svc.v1.TaskServicePromiseClient.prototype.removeTaskDueDate =
     function(request, metadata) {
   return this.client_.unaryCall(this.hostname_ +
-      '/services.tasks_svc.v1.TaskService/UncompleteSubtask',
+      '/services.tasks_svc.v1.TaskService/RemoveTaskDueDate',
       request,
       metadata || {},
-      methodDescriptor_TaskService_UncompleteSubtask);
+      methodDescriptor_TaskService_RemoveTaskDueDate);
 };
 
 
 /**
  * @const
  * @type {!grpc.web.MethodDescriptor<
- *   !proto.services.tasks_svc.v1.DeleteSubtaskRequest,
- *   !proto.services.tasks_svc.v1.DeleteSubtaskResponse>}
+ *   !proto.services.tasks_svc.v1.DeleteTaskRequest,
+ *   !proto.services.tasks_svc.v1.DeleteTaskResponse>}
  */
-const methodDescriptor_TaskService_DeleteSubtask = new grpc.web.MethodDescriptor(
-  '/services.tasks_svc.v1.TaskService/DeleteSubtask',
+const methodDescriptor_TaskService_DeleteTask = new grpc.web.MethodDescriptor(
+  '/services.tasks_svc.v1.TaskService/DeleteTask',
   grpc.web.MethodType.UNARY,
-  proto.services.tasks_svc.v1.DeleteSubtaskRequest,
-  proto.services.tasks_svc.v1.DeleteSubtaskResponse,
+  proto.services.tasks_svc.v1.DeleteTaskRequest,
+  proto.services.tasks_svc.v1.DeleteTaskResponse,
   /**
-   * @param {!proto.services.tasks_svc.v1.DeleteSubtaskRequest} request
+   * @param {!proto.services.tasks_svc.v1.DeleteTaskRequest} request
    * @return {!Uint8Array}
    */
   function(request) {
     return request.serializeBinary();
   },
-  proto.services.tasks_svc.v1.DeleteSubtaskResponse.deserializeBinary
+  proto.services.tasks_svc.v1.DeleteTaskResponse.deserializeBinary
 );
 
 
 /**
- * @param {!proto.services.tasks_svc.v1.DeleteSubtaskRequest} request The
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskRequest} request The
  *     request proto
  * @param {?Object<string, string>} metadata User defined
  *     call metadata
- * @param {function(?grpc.web.RpcError, ?proto.services.tasks_svc.v1.DeleteSubtaskResponse)}
+ * @param {function(?grpc.web.RpcError, ?proto.services.tasks_svc.v1.DeleteTaskResponse)}
  *     callback The callback function(error, response)
- * @return {!grpc.web.ClientReadableStream<!proto.services.tasks_svc.v1.DeleteSubtaskResponse>|undefined}
+ * @return {!grpc.web.ClientReadableStream<!proto.services.tasks_svc.v1.DeleteTaskResponse>|undefined}
  *     The XHR Node Readable Stream
  */
-proto.services.tasks_svc.v1.TaskServiceClient.prototype.deleteSubtask =
+proto.services.tasks_svc.v1.TaskServiceClient.prototype.deleteTask =
     function(request, metadata, callback) {
   return this.client_.rpcCall(this.hostname_ +
-      '/services.tasks_svc.v1.TaskService/DeleteSubtask',
+      '/services.tasks_svc.v1.TaskService/DeleteTask',
       request,
       metadata || {},
-      methodDescriptor_TaskService_DeleteSubtask,
+      methodDescriptor_TaskService_DeleteTask,
       callback);
 };
 
 
 /**
- * @param {!proto.services.tasks_svc.v1.DeleteSubtaskRequest} request The
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskRequest} request The
  *     request proto
  * @param {?Object<string, string>=} metadata User defined
  *     call metadata
- * @return {!Promise<!proto.services.tasks_svc.v1.DeleteSubtaskResponse>}
+ * @return {!Promise<!proto.services.tasks_svc.v1.DeleteTaskResponse>}
  *     Promise that resolves to the response
  */
-proto.services.tasks_svc.v1.TaskServicePromiseClient.prototype.deleteSubtask =
+proto.services.tasks_svc.v1.TaskServicePromiseClient.prototype.deleteTask =
     function(request, metadata) {
   return this.client_.unaryCall(this.hostname_ +
-      '/services.tasks_svc.v1.TaskService/DeleteSubtask',
+      '/services.tasks_svc.v1.TaskService/DeleteTask',
       request,
       metadata || {},
-      methodDescriptor_TaskService_DeleteSubtask);
+      methodDescriptor_TaskService_DeleteTask);
 };
 
 
diff --git a/gen/ts/services/tasks_svc/v1/task_svc_pb.d.ts b/gen/ts/services/tasks_svc/v1/task_svc_pb.d.ts
index 45f72e61b..c180e3009 100644
--- a/gen/ts/services/tasks_svc/v1/task_svc_pb.d.ts
+++ b/gen/ts/services/tasks_svc/v1/task_svc_pb.d.ts
@@ -31,6 +31,16 @@ export class CreateTaskRequest extends jspb.Message {
   hasInitialStatus(): boolean;
   clearInitialStatus(): CreateTaskRequest;
 
+  getAssignedUserId(): string;
+  setAssignedUserId(value: string): CreateTaskRequest;
+  hasAssignedUserId(): boolean;
+  clearAssignedUserId(): CreateTaskRequest;
+
+  getSubtasksList(): Array<CreateTaskRequest.SubTask>;
+  setSubtasksList(value: Array<CreateTaskRequest.SubTask>): CreateTaskRequest;
+  clearSubtasksList(): CreateTaskRequest;
+  addSubtasks(value?: CreateTaskRequest.SubTask, index?: number): CreateTaskRequest.SubTask;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): CreateTaskRequest.AsObject;
   static toObject(includeInstance: boolean, msg: CreateTaskRequest): CreateTaskRequest.AsObject;
@@ -47,8 +57,33 @@ export namespace CreateTaskRequest {
     pb_public?: boolean,
     dueAt?: google_protobuf_timestamp_pb.Timestamp.AsObject,
     initialStatus?: services_tasks_svc_v1_types_pb.TaskStatus,
+    assignedUserId?: string,
+    subtasksList: Array<CreateTaskRequest.SubTask.AsObject>,
   }
 
+  export class SubTask extends jspb.Message {
+    getName(): string;
+    setName(value: string): SubTask;
+
+    getDone(): boolean;
+    setDone(value: boolean): SubTask;
+
+    serializeBinary(): Uint8Array;
+    toObject(includeInstance?: boolean): SubTask.AsObject;
+    static toObject(includeInstance: boolean, msg: SubTask): SubTask.AsObject;
+    static serializeBinaryToWriter(message: SubTask, writer: jspb.BinaryWriter): void;
+    static deserializeBinary(bytes: Uint8Array): SubTask;
+    static deserializeBinaryFromReader(message: SubTask, reader: jspb.BinaryReader): SubTask;
+  }
+
+  export namespace SubTask {
+    export type AsObject = {
+      name: string,
+      done: boolean,
+    }
+  }
+
+
   export enum DescriptionCase { 
     _DESCRIPTION_NOT_SET = 0,
     DESCRIPTION = 2,
@@ -63,6 +98,11 @@ export namespace CreateTaskRequest {
     _INITIAL_STATUS_NOT_SET = 0,
     INITIAL_STATUS = 6,
   }
+
+  export enum AssignedUserIdCase { 
+    _ASSIGNED_USER_ID_NOT_SET = 0,
+    ASSIGNED_USER_ID = 7,
+  }
 }
 
 export class CreateTaskResponse extends jspb.Message {
@@ -107,6 +147,11 @@ export class UpdateTaskRequest extends jspb.Message {
   hasStatus(): boolean;
   clearStatus(): UpdateTaskRequest;
 
+  getPublic(): boolean;
+  setPublic(value: boolean): UpdateTaskRequest;
+  hasPublic(): boolean;
+  clearPublic(): UpdateTaskRequest;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): UpdateTaskRequest.AsObject;
   static toObject(includeInstance: boolean, msg: UpdateTaskRequest): UpdateTaskRequest.AsObject;
@@ -122,6 +167,7 @@ export namespace UpdateTaskRequest {
     description?: string,
     dueAt?: google_protobuf_timestamp_pb.Timestamp.AsObject,
     status?: services_tasks_svc_v1_types_pb.TaskStatus,
+    pb_public?: boolean,
   }
 
   export enum NameCase { 
@@ -143,6 +189,11 @@ export namespace UpdateTaskRequest {
     _STATUS_NOT_SET = 0,
     STATUS = 5,
   }
+
+  export enum PublicCase { 
+    _PUBLIC_NOT_SET = 0,
+    PUBLIC = 6,
+  }
 }
 
 export class UpdateTaskResponse extends jspb.Message {
@@ -192,10 +243,10 @@ export class GetTaskResponse extends jspb.Message {
   hasAssignedUserId(): boolean;
   clearAssignedUserId(): GetTaskResponse;
 
-  getSubtasksList(): Array<GetTaskResponse.Subtask>;
-  setSubtasksList(value: Array<GetTaskResponse.Subtask>): GetTaskResponse;
+  getSubtasksList(): Array<GetTaskResponse.SubTask>;
+  setSubtasksList(value: Array<GetTaskResponse.SubTask>): GetTaskResponse;
   clearSubtasksList(): GetTaskResponse;
-  addSubtasks(value?: GetTaskResponse.Subtask, index?: number): GetTaskResponse.Subtask;
+  addSubtasks(value?: GetTaskResponse.SubTask, index?: number): GetTaskResponse.SubTask;
 
   getStatus(): services_tasks_svc_v1_types_pb.TaskStatus;
   setStatus(value: services_tasks_svc_v1_types_pb.TaskStatus): GetTaskResponse;
@@ -205,6 +256,22 @@ export class GetTaskResponse extends jspb.Message {
   hasCreatedAt(): boolean;
   clearCreatedAt(): GetTaskResponse;
 
+  getPublic(): boolean;
+  setPublic(value: boolean): GetTaskResponse;
+
+  getDueAt(): google_protobuf_timestamp_pb.Timestamp | undefined;
+  setDueAt(value?: google_protobuf_timestamp_pb.Timestamp): GetTaskResponse;
+  hasDueAt(): boolean;
+  clearDueAt(): GetTaskResponse;
+
+  getCreatedBy(): string;
+  setCreatedBy(value: string): GetTaskResponse;
+
+  getPatient(): GetTaskResponse.Patient | undefined;
+  setPatient(value?: GetTaskResponse.Patient): GetTaskResponse;
+  hasPatient(): boolean;
+  clearPatient(): GetTaskResponse;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): GetTaskResponse.AsObject;
   static toObject(includeInstance: boolean, msg: GetTaskResponse): GetTaskResponse.AsObject;
@@ -219,34 +286,65 @@ export namespace GetTaskResponse {
     name: string,
     description: string,
     assignedUserId?: string,
-    subtasksList: Array<GetTaskResponse.Subtask.AsObject>,
+    subtasksList: Array<GetTaskResponse.SubTask.AsObject>,
     status: services_tasks_svc_v1_types_pb.TaskStatus,
     createdAt?: google_protobuf_timestamp_pb.Timestamp.AsObject,
+    pb_public: boolean,
+    dueAt?: google_protobuf_timestamp_pb.Timestamp.AsObject,
+    createdBy: string,
+    patient?: GetTaskResponse.Patient.AsObject,
   }
 
-  export class Subtask extends jspb.Message {
+  export class Patient extends jspb.Message {
     getId(): string;
-    setId(value: string): Subtask;
+    setId(value: string): Patient;
+
+    getHumanReadableIdentifier(): string;
+    setHumanReadableIdentifier(value: string): Patient;
+
+    serializeBinary(): Uint8Array;
+    toObject(includeInstance?: boolean): Patient.AsObject;
+    static toObject(includeInstance: boolean, msg: Patient): Patient.AsObject;
+    static serializeBinaryToWriter(message: Patient, writer: jspb.BinaryWriter): void;
+    static deserializeBinary(bytes: Uint8Array): Patient;
+    static deserializeBinaryFromReader(message: Patient, reader: jspb.BinaryReader): Patient;
+  }
+
+  export namespace Patient {
+    export type AsObject = {
+      id: string,
+      humanReadableIdentifier: string,
+    }
+  }
+
+
+  export class SubTask extends jspb.Message {
+    getId(): string;
+    setId(value: string): SubTask;
 
     getName(): string;
-    setName(value: string): Subtask;
+    setName(value: string): SubTask;
 
     getDone(): boolean;
-    setDone(value: boolean): Subtask;
+    setDone(value: boolean): SubTask;
+
+    getCreatedBy(): string;
+    setCreatedBy(value: string): SubTask;
 
     serializeBinary(): Uint8Array;
-    toObject(includeInstance?: boolean): Subtask.AsObject;
-    static toObject(includeInstance: boolean, msg: Subtask): Subtask.AsObject;
-    static serializeBinaryToWriter(message: Subtask, writer: jspb.BinaryWriter): void;
-    static deserializeBinary(bytes: Uint8Array): Subtask;
-    static deserializeBinaryFromReader(message: Subtask, reader: jspb.BinaryReader): Subtask;
+    toObject(includeInstance?: boolean): SubTask.AsObject;
+    static toObject(includeInstance: boolean, msg: SubTask): SubTask.AsObject;
+    static serializeBinaryToWriter(message: SubTask, writer: jspb.BinaryWriter): void;
+    static deserializeBinary(bytes: Uint8Array): SubTask;
+    static deserializeBinaryFromReader(message: SubTask, reader: jspb.BinaryReader): SubTask;
   }
 
-  export namespace Subtask {
+  export namespace SubTask {
     export type AsObject = {
       id: string,
       name: string,
       done: boolean,
+      createdBy: string,
     }
   }
 
@@ -649,8 +747,8 @@ export namespace GetAssignedTasksResponse {
       getId(): string;
       setId(value: string): Patient;
 
-      getName(): string;
-      setName(value: string): Patient;
+      getHumanReadableIdentifier(): string;
+      setHumanReadableIdentifier(value: string): Patient;
 
       serializeBinary(): Uint8Array;
       toObject(includeInstance?: boolean): Patient.AsObject;
@@ -663,7 +761,7 @@ export namespace GetAssignedTasksResponse {
     export namespace Patient {
       export type AsObject = {
         id: string,
-        name: string,
+        humanReadableIdentifier: string,
       }
     }
 
@@ -801,6 +899,9 @@ export namespace CreateSubtaskRequest {
     getName(): string;
     setName(value: string): Subtask;
 
+    getDone(): boolean;
+    setDone(value: boolean): Subtask;
+
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): Subtask.AsObject;
     static toObject(includeInstance: boolean, msg: Subtask): Subtask.AsObject;
@@ -812,6 +913,7 @@ export namespace CreateSubtaskRequest {
   export namespace Subtask {
     export type AsObject = {
       name: string,
+      done: boolean,
     }
   }
 
@@ -868,6 +970,11 @@ export namespace UpdateSubtaskRequest {
     hasName(): boolean;
     clearName(): Subtask;
 
+    getDone(): boolean;
+    setDone(value: boolean): Subtask;
+    hasDone(): boolean;
+    clearDone(): Subtask;
+
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): Subtask.AsObject;
     static toObject(includeInstance: boolean, msg: Subtask): Subtask.AsObject;
@@ -879,12 +986,18 @@ export namespace UpdateSubtaskRequest {
   export namespace Subtask {
     export type AsObject = {
       name?: string,
+      done?: boolean,
     }
 
     export enum NameCase { 
       _NAME_NOT_SET = 0,
       NAME = 1,
     }
+
+    export enum DoneCase { 
+      _DONE_NOT_SET = 0,
+      DONE = 2,
+    }
   }
 
 }
@@ -903,110 +1016,102 @@ export namespace UpdateSubtaskResponse {
   }
 }
 
-export class CompleteSubtaskRequest extends jspb.Message {
+export class DeleteSubtaskRequest extends jspb.Message {
   getTaskId(): string;
-  setTaskId(value: string): CompleteSubtaskRequest;
+  setTaskId(value: string): DeleteSubtaskRequest;
 
   getSubtaskId(): string;
-  setSubtaskId(value: string): CompleteSubtaskRequest;
+  setSubtaskId(value: string): DeleteSubtaskRequest;
 
   serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): CompleteSubtaskRequest.AsObject;
-  static toObject(includeInstance: boolean, msg: CompleteSubtaskRequest): CompleteSubtaskRequest.AsObject;
-  static serializeBinaryToWriter(message: CompleteSubtaskRequest, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): CompleteSubtaskRequest;
-  static deserializeBinaryFromReader(message: CompleteSubtaskRequest, reader: jspb.BinaryReader): CompleteSubtaskRequest;
+  toObject(includeInstance?: boolean): DeleteSubtaskRequest.AsObject;
+  static toObject(includeInstance: boolean, msg: DeleteSubtaskRequest): DeleteSubtaskRequest.AsObject;
+  static serializeBinaryToWriter(message: DeleteSubtaskRequest, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): DeleteSubtaskRequest;
+  static deserializeBinaryFromReader(message: DeleteSubtaskRequest, reader: jspb.BinaryReader): DeleteSubtaskRequest;
 }
 
-export namespace CompleteSubtaskRequest {
+export namespace DeleteSubtaskRequest {
   export type AsObject = {
     taskId: string,
     subtaskId: string,
   }
 }
 
-export class CompleteSubtaskResponse extends jspb.Message {
+export class DeleteSubtaskResponse extends jspb.Message {
   serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): CompleteSubtaskResponse.AsObject;
-  static toObject(includeInstance: boolean, msg: CompleteSubtaskResponse): CompleteSubtaskResponse.AsObject;
-  static serializeBinaryToWriter(message: CompleteSubtaskResponse, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): CompleteSubtaskResponse;
-  static deserializeBinaryFromReader(message: CompleteSubtaskResponse, reader: jspb.BinaryReader): CompleteSubtaskResponse;
+  toObject(includeInstance?: boolean): DeleteSubtaskResponse.AsObject;
+  static toObject(includeInstance: boolean, msg: DeleteSubtaskResponse): DeleteSubtaskResponse.AsObject;
+  static serializeBinaryToWriter(message: DeleteSubtaskResponse, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): DeleteSubtaskResponse;
+  static deserializeBinaryFromReader(message: DeleteSubtaskResponse, reader: jspb.BinaryReader): DeleteSubtaskResponse;
 }
 
-export namespace CompleteSubtaskResponse {
+export namespace DeleteSubtaskResponse {
   export type AsObject = {
   }
 }
 
-export class UncompleteSubtaskRequest extends jspb.Message {
+export class RemoveTaskDueDateRequest extends jspb.Message {
   getTaskId(): string;
-  setTaskId(value: string): UncompleteSubtaskRequest;
-
-  getSubtaskId(): string;
-  setSubtaskId(value: string): UncompleteSubtaskRequest;
+  setTaskId(value: string): RemoveTaskDueDateRequest;
 
   serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): UncompleteSubtaskRequest.AsObject;
-  static toObject(includeInstance: boolean, msg: UncompleteSubtaskRequest): UncompleteSubtaskRequest.AsObject;
-  static serializeBinaryToWriter(message: UncompleteSubtaskRequest, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): UncompleteSubtaskRequest;
-  static deserializeBinaryFromReader(message: UncompleteSubtaskRequest, reader: jspb.BinaryReader): UncompleteSubtaskRequest;
+  toObject(includeInstance?: boolean): RemoveTaskDueDateRequest.AsObject;
+  static toObject(includeInstance: boolean, msg: RemoveTaskDueDateRequest): RemoveTaskDueDateRequest.AsObject;
+  static serializeBinaryToWriter(message: RemoveTaskDueDateRequest, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): RemoveTaskDueDateRequest;
+  static deserializeBinaryFromReader(message: RemoveTaskDueDateRequest, reader: jspb.BinaryReader): RemoveTaskDueDateRequest;
 }
 
-export namespace UncompleteSubtaskRequest {
+export namespace RemoveTaskDueDateRequest {
   export type AsObject = {
     taskId: string,
-    subtaskId: string,
   }
 }
 
-export class UncompleteSubtaskResponse extends jspb.Message {
+export class RemoveTaskDueDateResponse extends jspb.Message {
   serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): UncompleteSubtaskResponse.AsObject;
-  static toObject(includeInstance: boolean, msg: UncompleteSubtaskResponse): UncompleteSubtaskResponse.AsObject;
-  static serializeBinaryToWriter(message: UncompleteSubtaskResponse, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): UncompleteSubtaskResponse;
-  static deserializeBinaryFromReader(message: UncompleteSubtaskResponse, reader: jspb.BinaryReader): UncompleteSubtaskResponse;
+  toObject(includeInstance?: boolean): RemoveTaskDueDateResponse.AsObject;
+  static toObject(includeInstance: boolean, msg: RemoveTaskDueDateResponse): RemoveTaskDueDateResponse.AsObject;
+  static serializeBinaryToWriter(message: RemoveTaskDueDateResponse, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): RemoveTaskDueDateResponse;
+  static deserializeBinaryFromReader(message: RemoveTaskDueDateResponse, reader: jspb.BinaryReader): RemoveTaskDueDateResponse;
 }
 
-export namespace UncompleteSubtaskResponse {
+export namespace RemoveTaskDueDateResponse {
   export type AsObject = {
   }
 }
 
-export class DeleteSubtaskRequest extends jspb.Message {
-  getTaskId(): string;
-  setTaskId(value: string): DeleteSubtaskRequest;
-
-  getSubtaskId(): string;
-  setSubtaskId(value: string): DeleteSubtaskRequest;
+export class DeleteTaskRequest extends jspb.Message {
+  getId(): string;
+  setId(value: string): DeleteTaskRequest;
 
   serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): DeleteSubtaskRequest.AsObject;
-  static toObject(includeInstance: boolean, msg: DeleteSubtaskRequest): DeleteSubtaskRequest.AsObject;
-  static serializeBinaryToWriter(message: DeleteSubtaskRequest, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): DeleteSubtaskRequest;
-  static deserializeBinaryFromReader(message: DeleteSubtaskRequest, reader: jspb.BinaryReader): DeleteSubtaskRequest;
+  toObject(includeInstance?: boolean): DeleteTaskRequest.AsObject;
+  static toObject(includeInstance: boolean, msg: DeleteTaskRequest): DeleteTaskRequest.AsObject;
+  static serializeBinaryToWriter(message: DeleteTaskRequest, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): DeleteTaskRequest;
+  static deserializeBinaryFromReader(message: DeleteTaskRequest, reader: jspb.BinaryReader): DeleteTaskRequest;
 }
 
-export namespace DeleteSubtaskRequest {
+export namespace DeleteTaskRequest {
   export type AsObject = {
-    taskId: string,
-    subtaskId: string,
+    id: string,
   }
 }
 
-export class DeleteSubtaskResponse extends jspb.Message {
+export class DeleteTaskResponse extends jspb.Message {
   serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): DeleteSubtaskResponse.AsObject;
-  static toObject(includeInstance: boolean, msg: DeleteSubtaskResponse): DeleteSubtaskResponse.AsObject;
-  static serializeBinaryToWriter(message: DeleteSubtaskResponse, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): DeleteSubtaskResponse;
-  static deserializeBinaryFromReader(message: DeleteSubtaskResponse, reader: jspb.BinaryReader): DeleteSubtaskResponse;
+  toObject(includeInstance?: boolean): DeleteTaskResponse.AsObject;
+  static toObject(includeInstance: boolean, msg: DeleteTaskResponse): DeleteTaskResponse.AsObject;
+  static serializeBinaryToWriter(message: DeleteTaskResponse, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): DeleteTaskResponse;
+  static deserializeBinaryFromReader(message: DeleteTaskResponse, reader: jspb.BinaryReader): DeleteTaskResponse;
 }
 
-export namespace DeleteSubtaskResponse {
+export namespace DeleteTaskResponse {
   export type AsObject = {
   }
 }
diff --git a/gen/ts/services/tasks_svc/v1/task_svc_pb.js b/gen/ts/services/tasks_svc/v1/task_svc_pb.js
index c274212d7..a3233d56f 100644
--- a/gen/ts/services/tasks_svc/v1/task_svc_pb.js
+++ b/gen/ts/services/tasks_svc/v1/task_svc_pb.js
@@ -27,15 +27,16 @@ var google_protobuf_timestamp_pb = require('google-protobuf/google/protobuf/time
 goog.object.extend(proto, google_protobuf_timestamp_pb);
 goog.exportSymbol('proto.services.tasks_svc.v1.AssignTaskRequest', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.AssignTaskResponse', null, global);
-goog.exportSymbol('proto.services.tasks_svc.v1.CompleteSubtaskRequest', null, global);
-goog.exportSymbol('proto.services.tasks_svc.v1.CompleteSubtaskResponse', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.CreateSubtaskRequest', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.CreateSubtaskRequest.Subtask', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.CreateSubtaskResponse', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.CreateTaskRequest', null, global);
+goog.exportSymbol('proto.services.tasks_svc.v1.CreateTaskRequest.SubTask', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.CreateTaskResponse', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.DeleteSubtaskRequest', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.DeleteSubtaskResponse', null, global);
+goog.exportSymbol('proto.services.tasks_svc.v1.DeleteTaskRequest', null, global);
+goog.exportSymbol('proto.services.tasks_svc.v1.DeleteTaskResponse', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetAssignedTasksRequest', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetAssignedTasksResponse', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetAssignedTasksResponse.Task', null, global);
@@ -43,7 +44,8 @@ goog.exportSymbol('proto.services.tasks_svc.v1.GetAssignedTasksResponse.Task.Pat
 goog.exportSymbol('proto.services.tasks_svc.v1.GetAssignedTasksResponse.Task.SubTask', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetTaskRequest', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetTaskResponse', null, global);
-goog.exportSymbol('proto.services.tasks_svc.v1.GetTaskResponse.Subtask', null, global);
+goog.exportSymbol('proto.services.tasks_svc.v1.GetTaskResponse.Patient', null, global);
+goog.exportSymbol('proto.services.tasks_svc.v1.GetTaskResponse.SubTask', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetTasksByPatientRequest', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetTasksByPatientResponse', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetTasksByPatientResponse.Task', null, global);
@@ -52,10 +54,10 @@ goog.exportSymbol('proto.services.tasks_svc.v1.GetTasksByPatientSortedByStatusRe
 goog.exportSymbol('proto.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task.SubTask', null, global);
+goog.exportSymbol('proto.services.tasks_svc.v1.RemoveTaskDueDateRequest', null, global);
+goog.exportSymbol('proto.services.tasks_svc.v1.RemoveTaskDueDateResponse', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.UnassignTaskRequest', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.UnassignTaskResponse', null, global);
-goog.exportSymbol('proto.services.tasks_svc.v1.UncompleteSubtaskRequest', null, global);
-goog.exportSymbol('proto.services.tasks_svc.v1.UncompleteSubtaskResponse', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.UpdateSubtaskRequest', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.UpdateSubtaskRequest.Subtask', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.UpdateSubtaskResponse', null, global);
@@ -72,7 +74,7 @@ goog.exportSymbol('proto.services.tasks_svc.v1.UpdateTaskResponse', null, global
  * @constructor
  */
 proto.services.tasks_svc.v1.CreateTaskRequest = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.services.tasks_svc.v1.CreateTaskRequest.repeatedFields_, null);
 };
 goog.inherits(proto.services.tasks_svc.v1.CreateTaskRequest, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
@@ -82,6 +84,27 @@ if (goog.DEBUG && !COMPILED) {
    */
   proto.services.tasks_svc.v1.CreateTaskRequest.displayName = 'proto.services.tasks_svc.v1.CreateTaskRequest';
 }
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.services.tasks_svc.v1.CreateTaskRequest.SubTask = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.services.tasks_svc.v1.CreateTaskRequest.SubTask, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.services.tasks_svc.v1.CreateTaskRequest.SubTask.displayName = 'proto.services.tasks_svc.v1.CreateTaskRequest.SubTask';
+}
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -197,16 +220,37 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.services.tasks_svc.v1.GetTaskResponse.Subtask = function(opt_data) {
+proto.services.tasks_svc.v1.GetTaskResponse.Patient = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.services.tasks_svc.v1.GetTaskResponse.Patient, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.services.tasks_svc.v1.GetTaskResponse.Patient.displayName = 'proto.services.tasks_svc.v1.GetTaskResponse.Patient';
+}
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.SubTask = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.services.tasks_svc.v1.GetTaskResponse.Subtask, jspb.Message);
+goog.inherits(proto.services.tasks_svc.v1.GetTaskResponse.SubTask, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.services.tasks_svc.v1.GetTaskResponse.Subtask.displayName = 'proto.services.tasks_svc.v1.GetTaskResponse.Subtask';
+  proto.services.tasks_svc.v1.GetTaskResponse.SubTask.displayName = 'proto.services.tasks_svc.v1.GetTaskResponse.SubTask';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -701,16 +745,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.services.tasks_svc.v1.CompleteSubtaskRequest = function(opt_data) {
+proto.services.tasks_svc.v1.DeleteSubtaskRequest = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.services.tasks_svc.v1.CompleteSubtaskRequest, jspb.Message);
+goog.inherits(proto.services.tasks_svc.v1.DeleteSubtaskRequest, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.services.tasks_svc.v1.CompleteSubtaskRequest.displayName = 'proto.services.tasks_svc.v1.CompleteSubtaskRequest';
+  proto.services.tasks_svc.v1.DeleteSubtaskRequest.displayName = 'proto.services.tasks_svc.v1.DeleteSubtaskRequest';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -722,16 +766,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.services.tasks_svc.v1.CompleteSubtaskResponse = function(opt_data) {
+proto.services.tasks_svc.v1.DeleteSubtaskResponse = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.services.tasks_svc.v1.CompleteSubtaskResponse, jspb.Message);
+goog.inherits(proto.services.tasks_svc.v1.DeleteSubtaskResponse, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.services.tasks_svc.v1.CompleteSubtaskResponse.displayName = 'proto.services.tasks_svc.v1.CompleteSubtaskResponse';
+  proto.services.tasks_svc.v1.DeleteSubtaskResponse.displayName = 'proto.services.tasks_svc.v1.DeleteSubtaskResponse';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -743,16 +787,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.services.tasks_svc.v1.UncompleteSubtaskRequest = function(opt_data) {
+proto.services.tasks_svc.v1.RemoveTaskDueDateRequest = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.services.tasks_svc.v1.UncompleteSubtaskRequest, jspb.Message);
+goog.inherits(proto.services.tasks_svc.v1.RemoveTaskDueDateRequest, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.services.tasks_svc.v1.UncompleteSubtaskRequest.displayName = 'proto.services.tasks_svc.v1.UncompleteSubtaskRequest';
+  proto.services.tasks_svc.v1.RemoveTaskDueDateRequest.displayName = 'proto.services.tasks_svc.v1.RemoveTaskDueDateRequest';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -764,16 +808,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.services.tasks_svc.v1.UncompleteSubtaskResponse = function(opt_data) {
+proto.services.tasks_svc.v1.RemoveTaskDueDateResponse = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.services.tasks_svc.v1.UncompleteSubtaskResponse, jspb.Message);
+goog.inherits(proto.services.tasks_svc.v1.RemoveTaskDueDateResponse, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.services.tasks_svc.v1.UncompleteSubtaskResponse.displayName = 'proto.services.tasks_svc.v1.UncompleteSubtaskResponse';
+  proto.services.tasks_svc.v1.RemoveTaskDueDateResponse.displayName = 'proto.services.tasks_svc.v1.RemoveTaskDueDateResponse';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -785,16 +829,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.services.tasks_svc.v1.DeleteSubtaskRequest = function(opt_data) {
+proto.services.tasks_svc.v1.DeleteTaskRequest = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.services.tasks_svc.v1.DeleteSubtaskRequest, jspb.Message);
+goog.inherits(proto.services.tasks_svc.v1.DeleteTaskRequest, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.services.tasks_svc.v1.DeleteSubtaskRequest.displayName = 'proto.services.tasks_svc.v1.DeleteSubtaskRequest';
+  proto.services.tasks_svc.v1.DeleteTaskRequest.displayName = 'proto.services.tasks_svc.v1.DeleteTaskRequest';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -806,18 +850,25 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.services.tasks_svc.v1.DeleteSubtaskResponse = function(opt_data) {
+proto.services.tasks_svc.v1.DeleteTaskResponse = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.services.tasks_svc.v1.DeleteSubtaskResponse, jspb.Message);
+goog.inherits(proto.services.tasks_svc.v1.DeleteTaskResponse, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.services.tasks_svc.v1.DeleteSubtaskResponse.displayName = 'proto.services.tasks_svc.v1.DeleteSubtaskResponse';
+  proto.services.tasks_svc.v1.DeleteTaskResponse.displayName = 'proto.services.tasks_svc.v1.DeleteTaskResponse';
 }
 
+/**
+ * List of repeated fields within this message type.
+ * @private {!Array<number>}
+ * @const
+ */
+proto.services.tasks_svc.v1.CreateTaskRequest.repeatedFields_ = [8];
+
 
 
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -854,7 +905,10 @@ proto.services.tasks_svc.v1.CreateTaskRequest.toObject = function(includeInstanc
     patientId: jspb.Message.getFieldWithDefault(msg, 3, ""),
     pb_public: jspb.Message.getBooleanFieldWithDefault(msg, 4, false),
     dueAt: (f = msg.getDueAt()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f),
-    initialStatus: jspb.Message.getFieldWithDefault(msg, 6, 0)
+    initialStatus: jspb.Message.getFieldWithDefault(msg, 6, 0),
+    assignedUserId: jspb.Message.getFieldWithDefault(msg, 7, ""),
+    subtasksList: jspb.Message.toObjectList(msg.getSubtasksList(),
+    proto.services.tasks_svc.v1.CreateTaskRequest.SubTask.toObject, includeInstance)
   };
 
   if (includeInstance) {
@@ -916,6 +970,15 @@ proto.services.tasks_svc.v1.CreateTaskRequest.deserializeBinaryFromReader = func
       var value = /** @type {!proto.services.tasks_svc.v1.TaskStatus} */ (reader.readEnum());
       msg.setInitialStatus(value);
       break;
+    case 7:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setAssignedUserId(value);
+      break;
+    case 8:
+      var value = new proto.services.tasks_svc.v1.CreateTaskRequest.SubTask;
+      reader.readMessage(value,proto.services.tasks_svc.v1.CreateTaskRequest.SubTask.deserializeBinaryFromReader);
+      msg.addSubtasks(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -988,6 +1051,181 @@ proto.services.tasks_svc.v1.CreateTaskRequest.serializeBinaryToWriter = function
       f
     );
   }
+  f = /** @type {string} */ (jspb.Message.getField(message, 7));
+  if (f != null) {
+    writer.writeString(
+      7,
+      f
+    );
+  }
+  f = message.getSubtasksList();
+  if (f.length > 0) {
+    writer.writeRepeatedMessage(
+      8,
+      f,
+      proto.services.tasks_svc.v1.CreateTaskRequest.SubTask.serializeBinaryToWriter
+    );
+  }
+};
+
+
+
+
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.services.tasks_svc.v1.CreateTaskRequest.SubTask.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.CreateTaskRequest.SubTask.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.services.tasks_svc.v1.CreateTaskRequest.SubTask} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.services.tasks_svc.v1.CreateTaskRequest.SubTask.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    name: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    done: jspb.Message.getBooleanFieldWithDefault(msg, 2, false)
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.services.tasks_svc.v1.CreateTaskRequest.SubTask}
+ */
+proto.services.tasks_svc.v1.CreateTaskRequest.SubTask.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.services.tasks_svc.v1.CreateTaskRequest.SubTask;
+  return proto.services.tasks_svc.v1.CreateTaskRequest.SubTask.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.services.tasks_svc.v1.CreateTaskRequest.SubTask} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.services.tasks_svc.v1.CreateTaskRequest.SubTask}
+ */
+proto.services.tasks_svc.v1.CreateTaskRequest.SubTask.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setName(value);
+      break;
+    case 2:
+      var value = /** @type {boolean} */ (reader.readBool());
+      msg.setDone(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.services.tasks_svc.v1.CreateTaskRequest.SubTask.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.services.tasks_svc.v1.CreateTaskRequest.SubTask.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+
+
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.services.tasks_svc.v1.CreateTaskRequest.SubTask} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.services.tasks_svc.v1.CreateTaskRequest.SubTask.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getName();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
+  f = message.getDone();
+  if (f) {
+    writer.writeBool(
+      2,
+      f
+    );
+  }
+};
+
+
+/**
+ * optional string name = 1;
+ * @return {string}
+ */
+proto.services.tasks_svc.v1.CreateTaskRequest.SubTask.prototype.getName = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.services.tasks_svc.v1.CreateTaskRequest.SubTask} returns this
+ */
+proto.services.tasks_svc.v1.CreateTaskRequest.SubTask.prototype.setName = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
+};
+
+
+/**
+ * optional bool done = 2;
+ * @return {boolean}
+ */
+proto.services.tasks_svc.v1.CreateTaskRequest.SubTask.prototype.getDone = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 2, false));
+};
+
+
+/**
+ * @param {boolean} value
+ * @return {!proto.services.tasks_svc.v1.CreateTaskRequest.SubTask} returns this
+ */
+proto.services.tasks_svc.v1.CreateTaskRequest.SubTask.prototype.setDone = function(value) {
+  return jspb.Message.setProto3BooleanField(this, 2, value);
 };
 
 
@@ -1172,58 +1410,132 @@ proto.services.tasks_svc.v1.CreateTaskRequest.prototype.hasInitialStatus = funct
 };
 
 
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
 /**
- * Creates an object representation of this proto.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * Optional fields that are not set will be set to undefined.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
- * @param {boolean=} opt_includeInstance Deprecated. whether to include the
- *     JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @return {!Object}
+ * optional string assigned_user_id = 7;
+ * @return {string}
  */
-proto.services.tasks_svc.v1.CreateTaskResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.CreateTaskResponse.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.CreateTaskRequest.prototype.getAssignedUserId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, ""));
 };
 
 
 /**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Deprecated. Whether to include
- *     the JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.CreateTaskResponse} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
+ * @param {string} value
+ * @return {!proto.services.tasks_svc.v1.CreateTaskRequest} returns this
  */
-proto.services.tasks_svc.v1.CreateTaskResponse.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
+proto.services.tasks_svc.v1.CreateTaskRequest.prototype.setAssignedUserId = function(value) {
+  return jspb.Message.setField(this, 7, value);
 };
-}
 
 
 /**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.CreateTaskResponse}
+ * Clears the field making it undefined.
+ * @return {!proto.services.tasks_svc.v1.CreateTaskRequest} returns this
  */
-proto.services.tasks_svc.v1.CreateTaskResponse.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.CreateTaskResponse;
-  return proto.services.tasks_svc.v1.CreateTaskResponse.deserializeBinaryFromReader(msg, reader);
+proto.services.tasks_svc.v1.CreateTaskRequest.prototype.clearAssignedUserId = function() {
+  return jspb.Message.setField(this, 7, undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.services.tasks_svc.v1.CreateTaskRequest.prototype.hasAssignedUserId = function() {
+  return jspb.Message.getField(this, 7) != null;
+};
+
+
+/**
+ * repeated SubTask subtasks = 8;
+ * @return {!Array<!proto.services.tasks_svc.v1.CreateTaskRequest.SubTask>}
+ */
+proto.services.tasks_svc.v1.CreateTaskRequest.prototype.getSubtasksList = function() {
+  return /** @type{!Array<!proto.services.tasks_svc.v1.CreateTaskRequest.SubTask>} */ (
+    jspb.Message.getRepeatedWrapperField(this, proto.services.tasks_svc.v1.CreateTaskRequest.SubTask, 8));
+};
+
+
+/**
+ * @param {!Array<!proto.services.tasks_svc.v1.CreateTaskRequest.SubTask>} value
+ * @return {!proto.services.tasks_svc.v1.CreateTaskRequest} returns this
+*/
+proto.services.tasks_svc.v1.CreateTaskRequest.prototype.setSubtasksList = function(value) {
+  return jspb.Message.setRepeatedWrapperField(this, 8, value);
+};
+
+
+/**
+ * @param {!proto.services.tasks_svc.v1.CreateTaskRequest.SubTask=} opt_value
+ * @param {number=} opt_index
+ * @return {!proto.services.tasks_svc.v1.CreateTaskRequest.SubTask}
+ */
+proto.services.tasks_svc.v1.CreateTaskRequest.prototype.addSubtasks = function(opt_value, opt_index) {
+  return jspb.Message.addToRepeatedWrapperField(this, 8, opt_value, proto.services.tasks_svc.v1.CreateTaskRequest.SubTask, opt_index);
+};
+
+
+/**
+ * Clears the list making it empty but non-null.
+ * @return {!proto.services.tasks_svc.v1.CreateTaskRequest} returns this
+ */
+proto.services.tasks_svc.v1.CreateTaskRequest.prototype.clearSubtasksList = function() {
+  return this.setSubtasksList([]);
+};
+
+
+
+
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.services.tasks_svc.v1.CreateTaskResponse.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.CreateTaskResponse.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.services.tasks_svc.v1.CreateTaskResponse} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.services.tasks_svc.v1.CreateTaskResponse.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    id: jspb.Message.getFieldWithDefault(msg, 1, "")
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.services.tasks_svc.v1.CreateTaskResponse}
+ */
+proto.services.tasks_svc.v1.CreateTaskResponse.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.services.tasks_svc.v1.CreateTaskResponse;
+  return proto.services.tasks_svc.v1.CreateTaskResponse.deserializeBinaryFromReader(msg, reader);
 };
 
 
@@ -1338,7 +1650,8 @@ proto.services.tasks_svc.v1.UpdateTaskRequest.toObject = function(includeInstanc
     name: jspb.Message.getFieldWithDefault(msg, 2, ""),
     description: jspb.Message.getFieldWithDefault(msg, 3, ""),
     dueAt: (f = msg.getDueAt()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f),
-    status: jspb.Message.getFieldWithDefault(msg, 5, 0)
+    status: jspb.Message.getFieldWithDefault(msg, 5, 0),
+    pb_public: jspb.Message.getBooleanFieldWithDefault(msg, 6, false)
   };
 
   if (includeInstance) {
@@ -1396,6 +1709,10 @@ proto.services.tasks_svc.v1.UpdateTaskRequest.deserializeBinaryFromReader = func
       var value = /** @type {!proto.services.tasks_svc.v1.TaskStatus} */ (reader.readEnum());
       msg.setStatus(value);
       break;
+    case 6:
+      var value = /** @type {boolean} */ (reader.readBool());
+      msg.setPublic(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -1461,6 +1778,13 @@ proto.services.tasks_svc.v1.UpdateTaskRequest.serializeBinaryToWriter = function
       f
     );
   }
+  f = /** @type {boolean} */ (jspb.Message.getField(message, 6));
+  if (f != null) {
+    writer.writeBool(
+      6,
+      f
+    );
+  }
 };
 
 
@@ -1627,6 +1951,42 @@ proto.services.tasks_svc.v1.UpdateTaskRequest.prototype.hasStatus = function() {
 };
 
 
+/**
+ * optional bool public = 6;
+ * @return {boolean}
+ */
+proto.services.tasks_svc.v1.UpdateTaskRequest.prototype.getPublic = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 6, false));
+};
+
+
+/**
+ * @param {boolean} value
+ * @return {!proto.services.tasks_svc.v1.UpdateTaskRequest} returns this
+ */
+proto.services.tasks_svc.v1.UpdateTaskRequest.prototype.setPublic = function(value) {
+  return jspb.Message.setField(this, 6, value);
+};
+
+
+/**
+ * Clears the field making it undefined.
+ * @return {!proto.services.tasks_svc.v1.UpdateTaskRequest} returns this
+ */
+proto.services.tasks_svc.v1.UpdateTaskRequest.prototype.clearPublic = function() {
+  return jspb.Message.setField(this, 6, undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.services.tasks_svc.v1.UpdateTaskRequest.prototype.hasPublic = function() {
+  return jspb.Message.getField(this, 6) != null;
+};
+
+
 
 
 
@@ -1902,9 +2262,13 @@ proto.services.tasks_svc.v1.GetTaskResponse.toObject = function(includeInstance,
     description: jspb.Message.getFieldWithDefault(msg, 3, ""),
     assignedUserId: jspb.Message.getFieldWithDefault(msg, 4, ""),
     subtasksList: jspb.Message.toObjectList(msg.getSubtasksList(),
-    proto.services.tasks_svc.v1.GetTaskResponse.Subtask.toObject, includeInstance),
+    proto.services.tasks_svc.v1.GetTaskResponse.SubTask.toObject, includeInstance),
     status: jspb.Message.getFieldWithDefault(msg, 6, 0),
-    createdAt: (f = msg.getCreatedAt()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f)
+    createdAt: (f = msg.getCreatedAt()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f),
+    pb_public: jspb.Message.getBooleanFieldWithDefault(msg, 8, false),
+    dueAt: (f = msg.getDueAt()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f),
+    createdBy: jspb.Message.getFieldWithDefault(msg, 10, ""),
+    patient: (f = msg.getPatient()) && proto.services.tasks_svc.v1.GetTaskResponse.Patient.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -1958,8 +2322,8 @@ proto.services.tasks_svc.v1.GetTaskResponse.deserializeBinaryFromReader = functi
       msg.setAssignedUserId(value);
       break;
     case 5:
-      var value = new proto.services.tasks_svc.v1.GetTaskResponse.Subtask;
-      reader.readMessage(value,proto.services.tasks_svc.v1.GetTaskResponse.Subtask.deserializeBinaryFromReader);
+      var value = new proto.services.tasks_svc.v1.GetTaskResponse.SubTask;
+      reader.readMessage(value,proto.services.tasks_svc.v1.GetTaskResponse.SubTask.deserializeBinaryFromReader);
       msg.addSubtasks(value);
       break;
     case 6:
@@ -1971,6 +2335,24 @@ proto.services.tasks_svc.v1.GetTaskResponse.deserializeBinaryFromReader = functi
       reader.readMessage(value,google_protobuf_timestamp_pb.Timestamp.deserializeBinaryFromReader);
       msg.setCreatedAt(value);
       break;
+    case 8:
+      var value = /** @type {boolean} */ (reader.readBool());
+      msg.setPublic(value);
+      break;
+    case 9:
+      var value = new google_protobuf_timestamp_pb.Timestamp;
+      reader.readMessage(value,google_protobuf_timestamp_pb.Timestamp.deserializeBinaryFromReader);
+      msg.setDueAt(value);
+      break;
+    case 10:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setCreatedBy(value);
+      break;
+    case 11:
+      var value = new proto.services.tasks_svc.v1.GetTaskResponse.Patient;
+      reader.readMessage(value,proto.services.tasks_svc.v1.GetTaskResponse.Patient.deserializeBinaryFromReader);
+      msg.setPatient(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -2033,7 +2415,7 @@ proto.services.tasks_svc.v1.GetTaskResponse.serializeBinaryToWriter = function(m
     writer.writeRepeatedMessage(
       5,
       f,
-      proto.services.tasks_svc.v1.GetTaskResponse.Subtask.serializeBinaryToWriter
+      proto.services.tasks_svc.v1.GetTaskResponse.SubTask.serializeBinaryToWriter
     );
   }
   f = message.getStatus();
@@ -2051,6 +2433,36 @@ proto.services.tasks_svc.v1.GetTaskResponse.serializeBinaryToWriter = function(m
       google_protobuf_timestamp_pb.Timestamp.serializeBinaryToWriter
     );
   }
+  f = message.getPublic();
+  if (f) {
+    writer.writeBool(
+      8,
+      f
+    );
+  }
+  f = message.getDueAt();
+  if (f != null) {
+    writer.writeMessage(
+      9,
+      f,
+      google_protobuf_timestamp_pb.Timestamp.serializeBinaryToWriter
+    );
+  }
+  f = message.getCreatedBy();
+  if (f.length > 0) {
+    writer.writeString(
+      10,
+      f
+    );
+  }
+  f = message.getPatient();
+  if (f != null) {
+    writer.writeMessage(
+      11,
+      f,
+      proto.services.tasks_svc.v1.GetTaskResponse.Patient.serializeBinaryToWriter
+    );
+  }
 };
 
 
@@ -2070,8 +2482,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.GetTaskResponse.Subtask.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.GetTaskResponse.Subtask.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.GetTaskResponse.Patient.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.GetTaskResponse.Patient.toObject(opt_includeInstance, this);
 };
 
 
@@ -2080,15 +2492,176 @@ proto.services.tasks_svc.v1.GetTaskResponse.Subtask.prototype.toObject = functio
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.GetTaskResponse.Subtask} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.GetTaskResponse.Patient} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetTaskResponse.Subtask.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.GetTaskResponse.Patient.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    id: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    humanReadableIdentifier: jspb.Message.getFieldWithDefault(msg, 2, "")
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse.Patient}
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.Patient.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.services.tasks_svc.v1.GetTaskResponse.Patient;
+  return proto.services.tasks_svc.v1.GetTaskResponse.Patient.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.services.tasks_svc.v1.GetTaskResponse.Patient} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse.Patient}
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.Patient.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setId(value);
+      break;
+    case 2:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setHumanReadableIdentifier(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.Patient.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.services.tasks_svc.v1.GetTaskResponse.Patient.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+
+
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.services.tasks_svc.v1.GetTaskResponse.Patient} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.Patient.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getId();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
+  f = message.getHumanReadableIdentifier();
+  if (f.length > 0) {
+    writer.writeString(
+      2,
+      f
+    );
+  }
+};
+
+
+/**
+ * optional string id = 1;
+ * @return {string}
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.Patient.prototype.getId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse.Patient} returns this
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.Patient.prototype.setId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
+};
+
+
+/**
+ * optional string human_readable_identifier = 2;
+ * @return {string}
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.Patient.prototype.getHumanReadableIdentifier = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse.Patient} returns this
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.Patient.prototype.setHumanReadableIdentifier = function(value) {
+  return jspb.Message.setProto3StringField(this, 2, value);
+};
+
+
+
+
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.SubTask.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.GetTaskResponse.SubTask.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.services.tasks_svc.v1.GetTaskResponse.SubTask} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.SubTask.toObject = function(includeInstance, msg) {
   var f, obj = {
     id: jspb.Message.getFieldWithDefault(msg, 1, ""),
     name: jspb.Message.getFieldWithDefault(msg, 2, ""),
-    done: jspb.Message.getBooleanFieldWithDefault(msg, 3, false)
+    done: jspb.Message.getBooleanFieldWithDefault(msg, 3, false),
+    createdBy: jspb.Message.getFieldWithDefault(msg, 4, "")
   };
 
   if (includeInstance) {
@@ -2102,23 +2675,23 @@ proto.services.tasks_svc.v1.GetTaskResponse.Subtask.toObject = function(includeI
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.GetTaskResponse.Subtask}
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse.SubTask}
  */
-proto.services.tasks_svc.v1.GetTaskResponse.Subtask.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.GetTaskResponse.SubTask.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.GetTaskResponse.Subtask;
-  return proto.services.tasks_svc.v1.GetTaskResponse.Subtask.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.GetTaskResponse.SubTask;
+  return proto.services.tasks_svc.v1.GetTaskResponse.SubTask.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.GetTaskResponse.Subtask} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.GetTaskResponse.SubTask} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.GetTaskResponse.Subtask}
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse.SubTask}
  */
-proto.services.tasks_svc.v1.GetTaskResponse.Subtask.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.GetTaskResponse.SubTask.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -2137,6 +2710,10 @@ proto.services.tasks_svc.v1.GetTaskResponse.Subtask.deserializeBinaryFromReader
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setDone(value);
       break;
+    case 4:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setCreatedBy(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -2150,9 +2727,9 @@ proto.services.tasks_svc.v1.GetTaskResponse.Subtask.deserializeBinaryFromReader
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.GetTaskResponse.Subtask.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.GetTaskResponse.SubTask.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.GetTaskResponse.Subtask.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.GetTaskResponse.SubTask.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -2160,11 +2737,11 @@ proto.services.tasks_svc.v1.GetTaskResponse.Subtask.prototype.serializeBinary =
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.GetTaskResponse.Subtask} message
+ * @param {!proto.services.tasks_svc.v1.GetTaskResponse.SubTask} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetTaskResponse.Subtask.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.GetTaskResponse.SubTask.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getId();
   if (f.length > 0) {
@@ -2187,6 +2764,13 @@ proto.services.tasks_svc.v1.GetTaskResponse.Subtask.serializeBinaryToWriter = fu
       f
     );
   }
+  f = message.getCreatedBy();
+  if (f.length > 0) {
+    writer.writeString(
+      4,
+      f
+    );
+  }
 };
 
 
@@ -2194,16 +2778,16 @@ proto.services.tasks_svc.v1.GetTaskResponse.Subtask.serializeBinaryToWriter = fu
  * optional string id = 1;
  * @return {string}
  */
-proto.services.tasks_svc.v1.GetTaskResponse.Subtask.prototype.getId = function() {
+proto.services.tasks_svc.v1.GetTaskResponse.SubTask.prototype.getId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetTaskResponse.Subtask} returns this
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse.SubTask} returns this
  */
-proto.services.tasks_svc.v1.GetTaskResponse.Subtask.prototype.setId = function(value) {
+proto.services.tasks_svc.v1.GetTaskResponse.SubTask.prototype.setId = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 
@@ -2212,16 +2796,16 @@ proto.services.tasks_svc.v1.GetTaskResponse.Subtask.prototype.setId = function(v
  * optional string name = 2;
  * @return {string}
  */
-proto.services.tasks_svc.v1.GetTaskResponse.Subtask.prototype.getName = function() {
+proto.services.tasks_svc.v1.GetTaskResponse.SubTask.prototype.getName = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetTaskResponse.Subtask} returns this
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse.SubTask} returns this
  */
-proto.services.tasks_svc.v1.GetTaskResponse.Subtask.prototype.setName = function(value) {
+proto.services.tasks_svc.v1.GetTaskResponse.SubTask.prototype.setName = function(value) {
   return jspb.Message.setProto3StringField(this, 2, value);
 };
 
@@ -2230,20 +2814,38 @@ proto.services.tasks_svc.v1.GetTaskResponse.Subtask.prototype.setName = function
  * optional bool done = 3;
  * @return {boolean}
  */
-proto.services.tasks_svc.v1.GetTaskResponse.Subtask.prototype.getDone = function() {
+proto.services.tasks_svc.v1.GetTaskResponse.SubTask.prototype.getDone = function() {
   return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 3, false));
 };
 
 
 /**
  * @param {boolean} value
- * @return {!proto.services.tasks_svc.v1.GetTaskResponse.Subtask} returns this
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse.SubTask} returns this
  */
-proto.services.tasks_svc.v1.GetTaskResponse.Subtask.prototype.setDone = function(value) {
+proto.services.tasks_svc.v1.GetTaskResponse.SubTask.prototype.setDone = function(value) {
   return jspb.Message.setProto3BooleanField(this, 3, value);
 };
 
 
+/**
+ * optional string created_by = 4;
+ * @return {string}
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.SubTask.prototype.getCreatedBy = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse.SubTask} returns this
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.SubTask.prototype.setCreatedBy = function(value) {
+  return jspb.Message.setProto3StringField(this, 4, value);
+};
+
+
 /**
  * optional string id = 1;
  * @return {string}
@@ -2317,95 +2919,205 @@ proto.services.tasks_svc.v1.GetTaskResponse.prototype.setAssignedUserId = functi
 
 
 /**
- * Clears the field making it undefined.
- * @return {!proto.services.tasks_svc.v1.GetTaskResponse} returns this
+ * Clears the field making it undefined.
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse} returns this
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.clearAssignedUserId = function() {
+  return jspb.Message.setField(this, 4, undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.hasAssignedUserId = function() {
+  return jspb.Message.getField(this, 4) != null;
+};
+
+
+/**
+ * repeated SubTask subtasks = 5;
+ * @return {!Array<!proto.services.tasks_svc.v1.GetTaskResponse.SubTask>}
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.getSubtasksList = function() {
+  return /** @type{!Array<!proto.services.tasks_svc.v1.GetTaskResponse.SubTask>} */ (
+    jspb.Message.getRepeatedWrapperField(this, proto.services.tasks_svc.v1.GetTaskResponse.SubTask, 5));
+};
+
+
+/**
+ * @param {!Array<!proto.services.tasks_svc.v1.GetTaskResponse.SubTask>} value
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse} returns this
+*/
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.setSubtasksList = function(value) {
+  return jspb.Message.setRepeatedWrapperField(this, 5, value);
+};
+
+
+/**
+ * @param {!proto.services.tasks_svc.v1.GetTaskResponse.SubTask=} opt_value
+ * @param {number=} opt_index
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse.SubTask}
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.addSubtasks = function(opt_value, opt_index) {
+  return jspb.Message.addToRepeatedWrapperField(this, 5, opt_value, proto.services.tasks_svc.v1.GetTaskResponse.SubTask, opt_index);
+};
+
+
+/**
+ * Clears the list making it empty but non-null.
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse} returns this
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.clearSubtasksList = function() {
+  return this.setSubtasksList([]);
+};
+
+
+/**
+ * optional TaskStatus status = 6;
+ * @return {!proto.services.tasks_svc.v1.TaskStatus}
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.getStatus = function() {
+  return /** @type {!proto.services.tasks_svc.v1.TaskStatus} */ (jspb.Message.getFieldWithDefault(this, 6, 0));
+};
+
+
+/**
+ * @param {!proto.services.tasks_svc.v1.TaskStatus} value
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse} returns this
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.setStatus = function(value) {
+  return jspb.Message.setProto3EnumField(this, 6, value);
+};
+
+
+/**
+ * optional google.protobuf.Timestamp created_at = 7;
+ * @return {?proto.google.protobuf.Timestamp}
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.getCreatedAt = function() {
+  return /** @type{?proto.google.protobuf.Timestamp} */ (
+    jspb.Message.getWrapperField(this, google_protobuf_timestamp_pb.Timestamp, 7));
+};
+
+
+/**
+ * @param {?proto.google.protobuf.Timestamp|undefined} value
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse} returns this
+*/
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.setCreatedAt = function(value) {
+  return jspb.Message.setWrapperField(this, 7, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse} returns this
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.clearCreatedAt = function() {
+  return this.setCreatedAt(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.hasCreatedAt = function() {
+  return jspb.Message.getField(this, 7) != null;
+};
+
+
+/**
+ * optional bool public = 8;
+ * @return {boolean}
  */
-proto.services.tasks_svc.v1.GetTaskResponse.prototype.clearAssignedUserId = function() {
-  return jspb.Message.setField(this, 4, undefined);
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.getPublic = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 8, false));
 };
 
 
 /**
- * Returns whether this field is set.
- * @return {boolean}
+ * @param {boolean} value
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse} returns this
  */
-proto.services.tasks_svc.v1.GetTaskResponse.prototype.hasAssignedUserId = function() {
-  return jspb.Message.getField(this, 4) != null;
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.setPublic = function(value) {
+  return jspb.Message.setProto3BooleanField(this, 8, value);
 };
 
 
 /**
- * repeated Subtask subtasks = 5;
- * @return {!Array<!proto.services.tasks_svc.v1.GetTaskResponse.Subtask>}
+ * optional google.protobuf.Timestamp due_at = 9;
+ * @return {?proto.google.protobuf.Timestamp}
  */
-proto.services.tasks_svc.v1.GetTaskResponse.prototype.getSubtasksList = function() {
-  return /** @type{!Array<!proto.services.tasks_svc.v1.GetTaskResponse.Subtask>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.services.tasks_svc.v1.GetTaskResponse.Subtask, 5));
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.getDueAt = function() {
+  return /** @type{?proto.google.protobuf.Timestamp} */ (
+    jspb.Message.getWrapperField(this, google_protobuf_timestamp_pb.Timestamp, 9));
 };
 
 
 /**
- * @param {!Array<!proto.services.tasks_svc.v1.GetTaskResponse.Subtask>} value
+ * @param {?proto.google.protobuf.Timestamp|undefined} value
  * @return {!proto.services.tasks_svc.v1.GetTaskResponse} returns this
 */
-proto.services.tasks_svc.v1.GetTaskResponse.prototype.setSubtasksList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 5, value);
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.setDueAt = function(value) {
+  return jspb.Message.setWrapperField(this, 9, value);
 };
 
 
 /**
- * @param {!proto.services.tasks_svc.v1.GetTaskResponse.Subtask=} opt_value
- * @param {number=} opt_index
- * @return {!proto.services.tasks_svc.v1.GetTaskResponse.Subtask}
+ * Clears the message field making it undefined.
+ * @return {!proto.services.tasks_svc.v1.GetTaskResponse} returns this
  */
-proto.services.tasks_svc.v1.GetTaskResponse.prototype.addSubtasks = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 5, opt_value, proto.services.tasks_svc.v1.GetTaskResponse.Subtask, opt_index);
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.clearDueAt = function() {
+  return this.setDueAt(undefined);
 };
 
 
 /**
- * Clears the list making it empty but non-null.
- * @return {!proto.services.tasks_svc.v1.GetTaskResponse} returns this
+ * Returns whether this field is set.
+ * @return {boolean}
  */
-proto.services.tasks_svc.v1.GetTaskResponse.prototype.clearSubtasksList = function() {
-  return this.setSubtasksList([]);
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.hasDueAt = function() {
+  return jspb.Message.getField(this, 9) != null;
 };
 
 
 /**
- * optional TaskStatus status = 6;
- * @return {!proto.services.tasks_svc.v1.TaskStatus}
+ * optional string created_by = 10;
+ * @return {string}
  */
-proto.services.tasks_svc.v1.GetTaskResponse.prototype.getStatus = function() {
-  return /** @type {!proto.services.tasks_svc.v1.TaskStatus} */ (jspb.Message.getFieldWithDefault(this, 6, 0));
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.getCreatedBy = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 10, ""));
 };
 
 
 /**
- * @param {!proto.services.tasks_svc.v1.TaskStatus} value
+ * @param {string} value
  * @return {!proto.services.tasks_svc.v1.GetTaskResponse} returns this
  */
-proto.services.tasks_svc.v1.GetTaskResponse.prototype.setStatus = function(value) {
-  return jspb.Message.setProto3EnumField(this, 6, value);
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.setCreatedBy = function(value) {
+  return jspb.Message.setProto3StringField(this, 10, value);
 };
 
 
 /**
- * optional google.protobuf.Timestamp created_at = 7;
- * @return {?proto.google.protobuf.Timestamp}
+ * optional Patient patient = 11;
+ * @return {?proto.services.tasks_svc.v1.GetTaskResponse.Patient}
  */
-proto.services.tasks_svc.v1.GetTaskResponse.prototype.getCreatedAt = function() {
-  return /** @type{?proto.google.protobuf.Timestamp} */ (
-    jspb.Message.getWrapperField(this, google_protobuf_timestamp_pb.Timestamp, 7));
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.getPatient = function() {
+  return /** @type{?proto.services.tasks_svc.v1.GetTaskResponse.Patient} */ (
+    jspb.Message.getWrapperField(this, proto.services.tasks_svc.v1.GetTaskResponse.Patient, 11));
 };
 
 
 /**
- * @param {?proto.google.protobuf.Timestamp|undefined} value
+ * @param {?proto.services.tasks_svc.v1.GetTaskResponse.Patient|undefined} value
  * @return {!proto.services.tasks_svc.v1.GetTaskResponse} returns this
 */
-proto.services.tasks_svc.v1.GetTaskResponse.prototype.setCreatedAt = function(value) {
-  return jspb.Message.setWrapperField(this, 7, value);
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.setPatient = function(value) {
+  return jspb.Message.setWrapperField(this, 11, value);
 };
 
 
@@ -2413,8 +3125,8 @@ proto.services.tasks_svc.v1.GetTaskResponse.prototype.setCreatedAt = function(va
  * Clears the message field making it undefined.
  * @return {!proto.services.tasks_svc.v1.GetTaskResponse} returns this
  */
-proto.services.tasks_svc.v1.GetTaskResponse.prototype.clearCreatedAt = function() {
-  return this.setCreatedAt(undefined);
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.clearPatient = function() {
+  return this.setPatient(undefined);
 };
 
 
@@ -2422,8 +3134,8 @@ proto.services.tasks_svc.v1.GetTaskResponse.prototype.clearCreatedAt = function(
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.services.tasks_svc.v1.GetTaskResponse.prototype.hasCreatedAt = function() {
-  return jspb.Message.getField(this, 7) != null;
+proto.services.tasks_svc.v1.GetTaskResponse.prototype.hasPatient = function() {
+  return jspb.Message.getField(this, 11) != null;
 };
 
 
@@ -5067,7 +5779,7 @@ proto.services.tasks_svc.v1.GetAssignedTasksResponse.Task.Patient.prototype.toOb
 proto.services.tasks_svc.v1.GetAssignedTasksResponse.Task.Patient.toObject = function(includeInstance, msg) {
   var f, obj = {
     id: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    name: jspb.Message.getFieldWithDefault(msg, 2, "")
+    humanReadableIdentifier: jspb.Message.getFieldWithDefault(msg, 2, "")
   };
 
   if (includeInstance) {
@@ -5110,7 +5822,7 @@ proto.services.tasks_svc.v1.GetAssignedTasksResponse.Task.Patient.deserializeBin
       break;
     case 2:
       var value = /** @type {string} */ (reader.readString());
-      msg.setName(value);
+      msg.setHumanReadableIdentifier(value);
       break;
     default:
       reader.skipField();
@@ -5148,7 +5860,7 @@ proto.services.tasks_svc.v1.GetAssignedTasksResponse.Task.Patient.serializeBinar
       f
     );
   }
-  f = message.getName();
+  f = message.getHumanReadableIdentifier();
   if (f.length > 0) {
     writer.writeString(
       2,
@@ -5177,10 +5889,10 @@ proto.services.tasks_svc.v1.GetAssignedTasksResponse.Task.Patient.prototype.setI
 
 
 /**
- * optional string name = 2;
+ * optional string human_readable_identifier = 2;
  * @return {string}
  */
-proto.services.tasks_svc.v1.GetAssignedTasksResponse.Task.Patient.prototype.getName = function() {
+proto.services.tasks_svc.v1.GetAssignedTasksResponse.Task.Patient.prototype.getHumanReadableIdentifier = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
@@ -5189,7 +5901,7 @@ proto.services.tasks_svc.v1.GetAssignedTasksResponse.Task.Patient.prototype.getN
  * @param {string} value
  * @return {!proto.services.tasks_svc.v1.GetAssignedTasksResponse.Task.Patient} returns this
  */
-proto.services.tasks_svc.v1.GetAssignedTasksResponse.Task.Patient.prototype.setName = function(value) {
+proto.services.tasks_svc.v1.GetAssignedTasksResponse.Task.Patient.prototype.setHumanReadableIdentifier = function(value) {
   return jspb.Message.setProto3StringField(this, 2, value);
 };
 
@@ -6407,7 +7119,8 @@ proto.services.tasks_svc.v1.CreateSubtaskRequest.Subtask.prototype.toObject = fu
  */
 proto.services.tasks_svc.v1.CreateSubtaskRequest.Subtask.toObject = function(includeInstance, msg) {
   var f, obj = {
-    name: jspb.Message.getFieldWithDefault(msg, 1, "")
+    name: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    done: jspb.Message.getBooleanFieldWithDefault(msg, 2, false)
   };
 
   if (includeInstance) {
@@ -6448,6 +7161,10 @@ proto.services.tasks_svc.v1.CreateSubtaskRequest.Subtask.deserializeBinaryFromRe
       var value = /** @type {string} */ (reader.readString());
       msg.setName(value);
       break;
+    case 2:
+      var value = /** @type {boolean} */ (reader.readBool());
+      msg.setDone(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -6484,6 +7201,13 @@ proto.services.tasks_svc.v1.CreateSubtaskRequest.Subtask.serializeBinaryToWriter
       f
     );
   }
+  f = message.getDone();
+  if (f) {
+    writer.writeBool(
+      2,
+      f
+    );
+  }
 };
 
 
@@ -6505,6 +7229,24 @@ proto.services.tasks_svc.v1.CreateSubtaskRequest.Subtask.prototype.setName = fun
 };
 
 
+/**
+ * optional bool done = 2;
+ * @return {boolean}
+ */
+proto.services.tasks_svc.v1.CreateSubtaskRequest.Subtask.prototype.getDone = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 2, false));
+};
+
+
+/**
+ * @param {boolean} value
+ * @return {!proto.services.tasks_svc.v1.CreateSubtaskRequest.Subtask} returns this
+ */
+proto.services.tasks_svc.v1.CreateSubtaskRequest.Subtask.prototype.setDone = function(value) {
+  return jspb.Message.setProto3BooleanField(this, 2, value);
+};
+
+
 /**
  * optional string task_id = 1;
  * @return {string}
@@ -6860,7 +7602,8 @@ proto.services.tasks_svc.v1.UpdateSubtaskRequest.Subtask.prototype.toObject = fu
  */
 proto.services.tasks_svc.v1.UpdateSubtaskRequest.Subtask.toObject = function(includeInstance, msg) {
   var f, obj = {
-    name: jspb.Message.getFieldWithDefault(msg, 1, "")
+    name: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    done: jspb.Message.getBooleanFieldWithDefault(msg, 2, false)
   };
 
   if (includeInstance) {
@@ -6901,6 +7644,10 @@ proto.services.tasks_svc.v1.UpdateSubtaskRequest.Subtask.deserializeBinaryFromRe
       var value = /** @type {string} */ (reader.readString());
       msg.setName(value);
       break;
+    case 2:
+      var value = /** @type {boolean} */ (reader.readBool());
+      msg.setDone(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -6937,6 +7684,13 @@ proto.services.tasks_svc.v1.UpdateSubtaskRequest.Subtask.serializeBinaryToWriter
       f
     );
   }
+  f = /** @type {boolean} */ (jspb.Message.getField(message, 2));
+  if (f != null) {
+    writer.writeBool(
+      2,
+      f
+    );
+  }
 };
 
 
@@ -6976,6 +7730,42 @@ proto.services.tasks_svc.v1.UpdateSubtaskRequest.Subtask.prototype.hasName = fun
 };
 
 
+/**
+ * optional bool done = 2;
+ * @return {boolean}
+ */
+proto.services.tasks_svc.v1.UpdateSubtaskRequest.Subtask.prototype.getDone = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 2, false));
+};
+
+
+/**
+ * @param {boolean} value
+ * @return {!proto.services.tasks_svc.v1.UpdateSubtaskRequest.Subtask} returns this
+ */
+proto.services.tasks_svc.v1.UpdateSubtaskRequest.Subtask.prototype.setDone = function(value) {
+  return jspb.Message.setField(this, 2, value);
+};
+
+
+/**
+ * Clears the field making it undefined.
+ * @return {!proto.services.tasks_svc.v1.UpdateSubtaskRequest.Subtask} returns this
+ */
+proto.services.tasks_svc.v1.UpdateSubtaskRequest.Subtask.prototype.clearDone = function() {
+  return jspb.Message.setField(this, 2, undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.services.tasks_svc.v1.UpdateSubtaskRequest.Subtask.prototype.hasDone = function() {
+  return jspb.Message.getField(this, 2) != null;
+};
+
+
 /**
  * optional string task_id = 1;
  * @return {string}
@@ -7166,8 +7956,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.CompleteSubtaskRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.CompleteSubtaskRequest.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.DeleteSubtaskRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.DeleteSubtaskRequest.toObject(opt_includeInstance, this);
 };
 
 
@@ -7176,11 +7966,11 @@ proto.services.tasks_svc.v1.CompleteSubtaskRequest.prototype.toObject = function
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.CompleteSubtaskRequest} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.DeleteSubtaskRequest} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.CompleteSubtaskRequest.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.DeleteSubtaskRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
     taskId: jspb.Message.getFieldWithDefault(msg, 1, ""),
     subtaskId: jspb.Message.getFieldWithDefault(msg, 2, "")
@@ -7197,23 +7987,23 @@ proto.services.tasks_svc.v1.CompleteSubtaskRequest.toObject = function(includeIn
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.CompleteSubtaskRequest}
+ * @return {!proto.services.tasks_svc.v1.DeleteSubtaskRequest}
  */
-proto.services.tasks_svc.v1.CompleteSubtaskRequest.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.DeleteSubtaskRequest.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.CompleteSubtaskRequest;
-  return proto.services.tasks_svc.v1.CompleteSubtaskRequest.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.DeleteSubtaskRequest;
+  return proto.services.tasks_svc.v1.DeleteSubtaskRequest.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.CompleteSubtaskRequest} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.DeleteSubtaskRequest} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.CompleteSubtaskRequest}
+ * @return {!proto.services.tasks_svc.v1.DeleteSubtaskRequest}
  */
-proto.services.tasks_svc.v1.CompleteSubtaskRequest.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.DeleteSubtaskRequest.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -7241,9 +8031,9 @@ proto.services.tasks_svc.v1.CompleteSubtaskRequest.deserializeBinaryFromReader =
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.CompleteSubtaskRequest.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.DeleteSubtaskRequest.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.CompleteSubtaskRequest.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.DeleteSubtaskRequest.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -7251,11 +8041,11 @@ proto.services.tasks_svc.v1.CompleteSubtaskRequest.prototype.serializeBinary = f
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.CompleteSubtaskRequest} message
+ * @param {!proto.services.tasks_svc.v1.DeleteSubtaskRequest} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.CompleteSubtaskRequest.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.DeleteSubtaskRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getTaskId();
   if (f.length > 0) {
@@ -7278,16 +8068,16 @@ proto.services.tasks_svc.v1.CompleteSubtaskRequest.serializeBinaryToWriter = fun
  * optional string task_id = 1;
  * @return {string}
  */
-proto.services.tasks_svc.v1.CompleteSubtaskRequest.prototype.getTaskId = function() {
+proto.services.tasks_svc.v1.DeleteSubtaskRequest.prototype.getTaskId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.CompleteSubtaskRequest} returns this
+ * @return {!proto.services.tasks_svc.v1.DeleteSubtaskRequest} returns this
  */
-proto.services.tasks_svc.v1.CompleteSubtaskRequest.prototype.setTaskId = function(value) {
+proto.services.tasks_svc.v1.DeleteSubtaskRequest.prototype.setTaskId = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 
@@ -7296,16 +8086,16 @@ proto.services.tasks_svc.v1.CompleteSubtaskRequest.prototype.setTaskId = functio
  * optional string subtask_id = 2;
  * @return {string}
  */
-proto.services.tasks_svc.v1.CompleteSubtaskRequest.prototype.getSubtaskId = function() {
+proto.services.tasks_svc.v1.DeleteSubtaskRequest.prototype.getSubtaskId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.CompleteSubtaskRequest} returns this
+ * @return {!proto.services.tasks_svc.v1.DeleteSubtaskRequest} returns this
  */
-proto.services.tasks_svc.v1.CompleteSubtaskRequest.prototype.setSubtaskId = function(value) {
+proto.services.tasks_svc.v1.DeleteSubtaskRequest.prototype.setSubtaskId = function(value) {
   return jspb.Message.setProto3StringField(this, 2, value);
 };
 
@@ -7326,8 +8116,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.CompleteSubtaskResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.CompleteSubtaskResponse.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.DeleteSubtaskResponse.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.DeleteSubtaskResponse.toObject(opt_includeInstance, this);
 };
 
 
@@ -7336,11 +8126,11 @@ proto.services.tasks_svc.v1.CompleteSubtaskResponse.prototype.toObject = functio
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.CompleteSubtaskResponse} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.DeleteSubtaskResponse} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.CompleteSubtaskResponse.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.DeleteSubtaskResponse.toObject = function(includeInstance, msg) {
   var f, obj = {
 
   };
@@ -7356,23 +8146,23 @@ proto.services.tasks_svc.v1.CompleteSubtaskResponse.toObject = function(includeI
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.CompleteSubtaskResponse}
+ * @return {!proto.services.tasks_svc.v1.DeleteSubtaskResponse}
  */
-proto.services.tasks_svc.v1.CompleteSubtaskResponse.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.DeleteSubtaskResponse.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.CompleteSubtaskResponse;
-  return proto.services.tasks_svc.v1.CompleteSubtaskResponse.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.DeleteSubtaskResponse;
+  return proto.services.tasks_svc.v1.DeleteSubtaskResponse.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.CompleteSubtaskResponse} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.DeleteSubtaskResponse} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.CompleteSubtaskResponse}
+ * @return {!proto.services.tasks_svc.v1.DeleteSubtaskResponse}
  */
-proto.services.tasks_svc.v1.CompleteSubtaskResponse.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.DeleteSubtaskResponse.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -7392,9 +8182,9 @@ proto.services.tasks_svc.v1.CompleteSubtaskResponse.deserializeBinaryFromReader
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.CompleteSubtaskResponse.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.DeleteSubtaskResponse.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.CompleteSubtaskResponse.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.DeleteSubtaskResponse.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -7402,11 +8192,11 @@ proto.services.tasks_svc.v1.CompleteSubtaskResponse.prototype.serializeBinary =
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.CompleteSubtaskResponse} message
+ * @param {!proto.services.tasks_svc.v1.DeleteSubtaskResponse} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.CompleteSubtaskResponse.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.DeleteSubtaskResponse.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
 };
 
@@ -7427,8 +8217,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.UncompleteSubtaskRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.UncompleteSubtaskRequest.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.RemoveTaskDueDateRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.RemoveTaskDueDateRequest.toObject(opt_includeInstance, this);
 };
 
 
@@ -7437,14 +8227,13 @@ proto.services.tasks_svc.v1.UncompleteSubtaskRequest.prototype.toObject = functi
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.UncompleteSubtaskRequest} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.RemoveTaskDueDateRequest} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.UncompleteSubtaskRequest.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.RemoveTaskDueDateRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
-    taskId: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    subtaskId: jspb.Message.getFieldWithDefault(msg, 2, "")
+    taskId: jspb.Message.getFieldWithDefault(msg, 1, "")
   };
 
   if (includeInstance) {
@@ -7458,23 +8247,23 @@ proto.services.tasks_svc.v1.UncompleteSubtaskRequest.toObject = function(include
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.UncompleteSubtaskRequest}
+ * @return {!proto.services.tasks_svc.v1.RemoveTaskDueDateRequest}
  */
-proto.services.tasks_svc.v1.UncompleteSubtaskRequest.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.RemoveTaskDueDateRequest.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.UncompleteSubtaskRequest;
-  return proto.services.tasks_svc.v1.UncompleteSubtaskRequest.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.RemoveTaskDueDateRequest;
+  return proto.services.tasks_svc.v1.RemoveTaskDueDateRequest.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.UncompleteSubtaskRequest} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.RemoveTaskDueDateRequest} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.UncompleteSubtaskRequest}
+ * @return {!proto.services.tasks_svc.v1.RemoveTaskDueDateRequest}
  */
-proto.services.tasks_svc.v1.UncompleteSubtaskRequest.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.RemoveTaskDueDateRequest.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -7485,10 +8274,6 @@ proto.services.tasks_svc.v1.UncompleteSubtaskRequest.deserializeBinaryFromReader
       var value = /** @type {string} */ (reader.readString());
       msg.setTaskId(value);
       break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setSubtaskId(value);
-      break;
     default:
       reader.skipField();
       break;
@@ -7502,9 +8287,9 @@ proto.services.tasks_svc.v1.UncompleteSubtaskRequest.deserializeBinaryFromReader
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.UncompleteSubtaskRequest.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.RemoveTaskDueDateRequest.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.UncompleteSubtaskRequest.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.RemoveTaskDueDateRequest.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -7512,11 +8297,11 @@ proto.services.tasks_svc.v1.UncompleteSubtaskRequest.prototype.serializeBinary =
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.UncompleteSubtaskRequest} message
+ * @param {!proto.services.tasks_svc.v1.RemoveTaskDueDateRequest} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.UncompleteSubtaskRequest.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.RemoveTaskDueDateRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getTaskId();
   if (f.length > 0) {
@@ -7525,13 +8310,6 @@ proto.services.tasks_svc.v1.UncompleteSubtaskRequest.serializeBinaryToWriter = f
       f
     );
   }
-  f = message.getSubtaskId();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
 };
 
 
@@ -7539,38 +8317,20 @@ proto.services.tasks_svc.v1.UncompleteSubtaskRequest.serializeBinaryToWriter = f
  * optional string task_id = 1;
  * @return {string}
  */
-proto.services.tasks_svc.v1.UncompleteSubtaskRequest.prototype.getTaskId = function() {
+proto.services.tasks_svc.v1.RemoveTaskDueDateRequest.prototype.getTaskId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.UncompleteSubtaskRequest} returns this
+ * @return {!proto.services.tasks_svc.v1.RemoveTaskDueDateRequest} returns this
  */
-proto.services.tasks_svc.v1.UncompleteSubtaskRequest.prototype.setTaskId = function(value) {
+proto.services.tasks_svc.v1.RemoveTaskDueDateRequest.prototype.setTaskId = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 
 
-/**
- * optional string subtask_id = 2;
- * @return {string}
- */
-proto.services.tasks_svc.v1.UncompleteSubtaskRequest.prototype.getSubtaskId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.UncompleteSubtaskRequest} returns this
- */
-proto.services.tasks_svc.v1.UncompleteSubtaskRequest.prototype.setSubtaskId = function(value) {
-  return jspb.Message.setProto3StringField(this, 2, value);
-};
-
-
 
 
 
@@ -7587,8 +8347,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.UncompleteSubtaskResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.UncompleteSubtaskResponse.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.RemoveTaskDueDateResponse.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.RemoveTaskDueDateResponse.toObject(opt_includeInstance, this);
 };
 
 
@@ -7597,11 +8357,11 @@ proto.services.tasks_svc.v1.UncompleteSubtaskResponse.prototype.toObject = funct
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.UncompleteSubtaskResponse} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.RemoveTaskDueDateResponse} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.UncompleteSubtaskResponse.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.RemoveTaskDueDateResponse.toObject = function(includeInstance, msg) {
   var f, obj = {
 
   };
@@ -7617,23 +8377,23 @@ proto.services.tasks_svc.v1.UncompleteSubtaskResponse.toObject = function(includ
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.UncompleteSubtaskResponse}
+ * @return {!proto.services.tasks_svc.v1.RemoveTaskDueDateResponse}
  */
-proto.services.tasks_svc.v1.UncompleteSubtaskResponse.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.RemoveTaskDueDateResponse.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.UncompleteSubtaskResponse;
-  return proto.services.tasks_svc.v1.UncompleteSubtaskResponse.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.RemoveTaskDueDateResponse;
+  return proto.services.tasks_svc.v1.RemoveTaskDueDateResponse.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.UncompleteSubtaskResponse} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.RemoveTaskDueDateResponse} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.UncompleteSubtaskResponse}
+ * @return {!proto.services.tasks_svc.v1.RemoveTaskDueDateResponse}
  */
-proto.services.tasks_svc.v1.UncompleteSubtaskResponse.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.RemoveTaskDueDateResponse.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -7653,9 +8413,9 @@ proto.services.tasks_svc.v1.UncompleteSubtaskResponse.deserializeBinaryFromReade
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.UncompleteSubtaskResponse.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.RemoveTaskDueDateResponse.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.UncompleteSubtaskResponse.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.RemoveTaskDueDateResponse.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -7663,11 +8423,11 @@ proto.services.tasks_svc.v1.UncompleteSubtaskResponse.prototype.serializeBinary
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.UncompleteSubtaskResponse} message
+ * @param {!proto.services.tasks_svc.v1.RemoveTaskDueDateResponse} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.UncompleteSubtaskResponse.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.RemoveTaskDueDateResponse.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
 };
 
@@ -7688,8 +8448,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.DeleteSubtaskRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.DeleteSubtaskRequest.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.DeleteTaskRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.DeleteTaskRequest.toObject(opt_includeInstance, this);
 };
 
 
@@ -7698,14 +8458,13 @@ proto.services.tasks_svc.v1.DeleteSubtaskRequest.prototype.toObject = function(o
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.DeleteSubtaskRequest} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskRequest} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.DeleteSubtaskRequest.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.DeleteTaskRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
-    taskId: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    subtaskId: jspb.Message.getFieldWithDefault(msg, 2, "")
+    id: jspb.Message.getFieldWithDefault(msg, 1, "")
   };
 
   if (includeInstance) {
@@ -7719,23 +8478,23 @@ proto.services.tasks_svc.v1.DeleteSubtaskRequest.toObject = function(includeInst
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.DeleteSubtaskRequest}
+ * @return {!proto.services.tasks_svc.v1.DeleteTaskRequest}
  */
-proto.services.tasks_svc.v1.DeleteSubtaskRequest.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.DeleteTaskRequest.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.DeleteSubtaskRequest;
-  return proto.services.tasks_svc.v1.DeleteSubtaskRequest.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.DeleteTaskRequest;
+  return proto.services.tasks_svc.v1.DeleteTaskRequest.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.DeleteSubtaskRequest} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskRequest} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.DeleteSubtaskRequest}
+ * @return {!proto.services.tasks_svc.v1.DeleteTaskRequest}
  */
-proto.services.tasks_svc.v1.DeleteSubtaskRequest.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.DeleteTaskRequest.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -7744,11 +8503,7 @@ proto.services.tasks_svc.v1.DeleteSubtaskRequest.deserializeBinaryFromReader = f
     switch (field) {
     case 1:
       var value = /** @type {string} */ (reader.readString());
-      msg.setTaskId(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setSubtaskId(value);
+      msg.setId(value);
       break;
     default:
       reader.skipField();
@@ -7763,9 +8518,9 @@ proto.services.tasks_svc.v1.DeleteSubtaskRequest.deserializeBinaryFromReader = f
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.DeleteSubtaskRequest.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.DeleteTaskRequest.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.DeleteSubtaskRequest.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.DeleteTaskRequest.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -7773,65 +8528,40 @@ proto.services.tasks_svc.v1.DeleteSubtaskRequest.prototype.serializeBinary = fun
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.DeleteSubtaskRequest} message
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskRequest} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.DeleteSubtaskRequest.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.DeleteTaskRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getTaskId();
+  f = message.getId();
   if (f.length > 0) {
     writer.writeString(
       1,
       f
     );
   }
-  f = message.getSubtaskId();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
 };
 
 
 /**
- * optional string task_id = 1;
+ * optional string id = 1;
  * @return {string}
  */
-proto.services.tasks_svc.v1.DeleteSubtaskRequest.prototype.getTaskId = function() {
+proto.services.tasks_svc.v1.DeleteTaskRequest.prototype.getId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.DeleteSubtaskRequest} returns this
+ * @return {!proto.services.tasks_svc.v1.DeleteTaskRequest} returns this
  */
-proto.services.tasks_svc.v1.DeleteSubtaskRequest.prototype.setTaskId = function(value) {
+proto.services.tasks_svc.v1.DeleteTaskRequest.prototype.setId = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 
 
-/**
- * optional string subtask_id = 2;
- * @return {string}
- */
-proto.services.tasks_svc.v1.DeleteSubtaskRequest.prototype.getSubtaskId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.DeleteSubtaskRequest} returns this
- */
-proto.services.tasks_svc.v1.DeleteSubtaskRequest.prototype.setSubtaskId = function(value) {
-  return jspb.Message.setProto3StringField(this, 2, value);
-};
-
-
 
 
 
@@ -7848,8 +8578,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.DeleteSubtaskResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.DeleteSubtaskResponse.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.DeleteTaskResponse.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.DeleteTaskResponse.toObject(opt_includeInstance, this);
 };
 
 
@@ -7858,11 +8588,11 @@ proto.services.tasks_svc.v1.DeleteSubtaskResponse.prototype.toObject = function(
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.DeleteSubtaskResponse} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskResponse} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.DeleteSubtaskResponse.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.DeleteTaskResponse.toObject = function(includeInstance, msg) {
   var f, obj = {
 
   };
@@ -7878,23 +8608,23 @@ proto.services.tasks_svc.v1.DeleteSubtaskResponse.toObject = function(includeIns
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.DeleteSubtaskResponse}
+ * @return {!proto.services.tasks_svc.v1.DeleteTaskResponse}
  */
-proto.services.tasks_svc.v1.DeleteSubtaskResponse.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.DeleteTaskResponse.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.DeleteSubtaskResponse;
-  return proto.services.tasks_svc.v1.DeleteSubtaskResponse.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.DeleteTaskResponse;
+  return proto.services.tasks_svc.v1.DeleteTaskResponse.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.DeleteSubtaskResponse} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskResponse} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.DeleteSubtaskResponse}
+ * @return {!proto.services.tasks_svc.v1.DeleteTaskResponse}
  */
-proto.services.tasks_svc.v1.DeleteSubtaskResponse.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.DeleteTaskResponse.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -7914,9 +8644,9 @@ proto.services.tasks_svc.v1.DeleteSubtaskResponse.deserializeBinaryFromReader =
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.DeleteSubtaskResponse.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.DeleteTaskResponse.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.DeleteSubtaskResponse.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.DeleteTaskResponse.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -7924,11 +8654,11 @@ proto.services.tasks_svc.v1.DeleteSubtaskResponse.prototype.serializeBinary = fu
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.DeleteSubtaskResponse} message
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskResponse} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.DeleteSubtaskResponse.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.DeleteTaskResponse.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
 };
 
diff --git a/gen/ts/services/tasks_svc/v1/task_template_svc_grpc_web_pb.d.ts b/gen/ts/services/tasks_svc/v1/task_template_svc_grpc_web_pb.d.ts
index 8f78b65f8..0b0fbe528 100644
--- a/gen/ts/services/tasks_svc/v1/task_template_svc_grpc_web_pb.d.ts
+++ b/gen/ts/services/tasks_svc/v1/task_template_svc_grpc_web_pb.d.ts
@@ -15,13 +15,6 @@ export class TaskTemplateServiceClient {
                response: services_tasks_svc_v1_task_template_svc_pb.CreateTaskTemplateResponse) => void
   ): grpcWeb.ClientReadableStream<services_tasks_svc_v1_task_template_svc_pb.CreateTaskTemplateResponse>;
 
-  getAllTaskTemplates(
-    request: services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesRequest,
-    metadata: grpcWeb.Metadata | undefined,
-    callback: (err: grpcWeb.RpcError,
-               response: services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesResponse) => void
-  ): grpcWeb.ClientReadableStream<services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesResponse>;
-
   deleteTaskTemplate(
     request: services_tasks_svc_v1_task_template_svc_pb.DeleteTaskTemplateRequest,
     metadata: grpcWeb.Metadata | undefined,
@@ -57,19 +50,12 @@ export class TaskTemplateServiceClient {
                response: services_tasks_svc_v1_task_template_svc_pb.CreateTaskTemplateSubTaskResponse) => void
   ): grpcWeb.ClientReadableStream<services_tasks_svc_v1_task_template_svc_pb.CreateTaskTemplateSubTaskResponse>;
 
-  getAllTaskTemplatesByCreator(
-    request: services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesByCreatorRequest,
-    metadata: grpcWeb.Metadata | undefined,
-    callback: (err: grpcWeb.RpcError,
-               response: services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesByCreatorResponse) => void
-  ): grpcWeb.ClientReadableStream<services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesByCreatorResponse>;
-
-  getAllTaskTemplatesByWard(
-    request: services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesByWardRequest,
+  getAllTaskTemplates(
+    request: services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesRequest,
     metadata: grpcWeb.Metadata | undefined,
     callback: (err: grpcWeb.RpcError,
-               response: services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesByWardResponse) => void
-  ): grpcWeb.ClientReadableStream<services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesByWardResponse>;
+               response: services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesResponse) => void
+  ): grpcWeb.ClientReadableStream<services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesResponse>;
 
 }
 
@@ -83,11 +69,6 @@ export class TaskTemplateServicePromiseClient {
     metadata?: grpcWeb.Metadata
   ): Promise<services_tasks_svc_v1_task_template_svc_pb.CreateTaskTemplateResponse>;
 
-  getAllTaskTemplates(
-    request: services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesRequest,
-    metadata?: grpcWeb.Metadata
-  ): Promise<services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesResponse>;
-
   deleteTaskTemplate(
     request: services_tasks_svc_v1_task_template_svc_pb.DeleteTaskTemplateRequest,
     metadata?: grpcWeb.Metadata
@@ -113,15 +94,10 @@ export class TaskTemplateServicePromiseClient {
     metadata?: grpcWeb.Metadata
   ): Promise<services_tasks_svc_v1_task_template_svc_pb.CreateTaskTemplateSubTaskResponse>;
 
-  getAllTaskTemplatesByCreator(
-    request: services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesByCreatorRequest,
-    metadata?: grpcWeb.Metadata
-  ): Promise<services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesByCreatorResponse>;
-
-  getAllTaskTemplatesByWard(
-    request: services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesByWardRequest,
+  getAllTaskTemplates(
+    request: services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesRequest,
     metadata?: grpcWeb.Metadata
-  ): Promise<services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesByWardResponse>;
+  ): Promise<services_tasks_svc_v1_task_template_svc_pb.GetAllTaskTemplatesResponse>;
 
 }
 
diff --git a/gen/ts/services/tasks_svc/v1/task_template_svc_grpc_web_pb.js b/gen/ts/services/tasks_svc/v1/task_template_svc_grpc_web_pb.js
index c734fbd34..ab172e0f8 100644
--- a/gen/ts/services/tasks_svc/v1/task_template_svc_grpc_web_pb.js
+++ b/gen/ts/services/tasks_svc/v1/task_template_svc_grpc_web_pb.js
@@ -137,67 +137,6 @@ proto.services.tasks_svc.v1.TaskTemplateServicePromiseClient.prototype.createTas
 };
 
 
-/**
- * @const
- * @type {!grpc.web.MethodDescriptor<
- *   !proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest,
- *   !proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse>}
- */
-const methodDescriptor_TaskTemplateService_GetAllTaskTemplates = new grpc.web.MethodDescriptor(
-  '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplates',
-  grpc.web.MethodType.UNARY,
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest,
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse,
-  /**
-   * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest} request
-   * @return {!Uint8Array}
-   */
-  function(request) {
-    return request.serializeBinary();
-  },
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.deserializeBinary
-);
-
-
-/**
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest} request The
- *     request proto
- * @param {?Object<string, string>} metadata User defined
- *     call metadata
- * @param {function(?grpc.web.RpcError, ?proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse)}
- *     callback The callback function(error, response)
- * @return {!grpc.web.ClientReadableStream<!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse>|undefined}
- *     The XHR Node Readable Stream
- */
-proto.services.tasks_svc.v1.TaskTemplateServiceClient.prototype.getAllTaskTemplates =
-    function(request, metadata, callback) {
-  return this.client_.rpcCall(this.hostname_ +
-      '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplates',
-      request,
-      metadata || {},
-      methodDescriptor_TaskTemplateService_GetAllTaskTemplates,
-      callback);
-};
-
-
-/**
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest} request The
- *     request proto
- * @param {?Object<string, string>=} metadata User defined
- *     call metadata
- * @return {!Promise<!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse>}
- *     Promise that resolves to the response
- */
-proto.services.tasks_svc.v1.TaskTemplateServicePromiseClient.prototype.getAllTaskTemplates =
-    function(request, metadata) {
-  return this.client_.unaryCall(this.hostname_ +
-      '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplates',
-      request,
-      metadata || {},
-      methodDescriptor_TaskTemplateService_GetAllTaskTemplates);
-};
-
-
 /**
  * @const
  * @type {!grpc.web.MethodDescriptor<
@@ -506,122 +445,61 @@ proto.services.tasks_svc.v1.TaskTemplateServicePromiseClient.prototype.createTas
 /**
  * @const
  * @type {!grpc.web.MethodDescriptor<
- *   !proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest,
- *   !proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse>}
- */
-const methodDescriptor_TaskTemplateService_GetAllTaskTemplatesByCreator = new grpc.web.MethodDescriptor(
-  '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplatesByCreator',
-  grpc.web.MethodType.UNARY,
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest,
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse,
-  /**
-   * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest} request
-   * @return {!Uint8Array}
-   */
-  function(request) {
-    return request.serializeBinary();
-  },
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.deserializeBinary
-);
-
-
-/**
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest} request The
- *     request proto
- * @param {?Object<string, string>} metadata User defined
- *     call metadata
- * @param {function(?grpc.web.RpcError, ?proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse)}
- *     callback The callback function(error, response)
- * @return {!grpc.web.ClientReadableStream<!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse>|undefined}
- *     The XHR Node Readable Stream
- */
-proto.services.tasks_svc.v1.TaskTemplateServiceClient.prototype.getAllTaskTemplatesByCreator =
-    function(request, metadata, callback) {
-  return this.client_.rpcCall(this.hostname_ +
-      '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplatesByCreator',
-      request,
-      metadata || {},
-      methodDescriptor_TaskTemplateService_GetAllTaskTemplatesByCreator,
-      callback);
-};
-
-
-/**
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest} request The
- *     request proto
- * @param {?Object<string, string>=} metadata User defined
- *     call metadata
- * @return {!Promise<!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse>}
- *     Promise that resolves to the response
- */
-proto.services.tasks_svc.v1.TaskTemplateServicePromiseClient.prototype.getAllTaskTemplatesByCreator =
-    function(request, metadata) {
-  return this.client_.unaryCall(this.hostname_ +
-      '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplatesByCreator',
-      request,
-      metadata || {},
-      methodDescriptor_TaskTemplateService_GetAllTaskTemplatesByCreator);
-};
-
-
-/**
- * @const
- * @type {!grpc.web.MethodDescriptor<
- *   !proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest,
- *   !proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse>}
+ *   !proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest,
+ *   !proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse>}
  */
-const methodDescriptor_TaskTemplateService_GetAllTaskTemplatesByWard = new grpc.web.MethodDescriptor(
-  '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplatesByWard',
+const methodDescriptor_TaskTemplateService_GetAllTaskTemplates = new grpc.web.MethodDescriptor(
+  '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplates',
   grpc.web.MethodType.UNARY,
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest,
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse,
+  proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest,
+  proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse,
   /**
-   * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest} request
+   * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest} request
    * @return {!Uint8Array}
    */
   function(request) {
     return request.serializeBinary();
   },
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.deserializeBinary
+  proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.deserializeBinary
 );
 
 
 /**
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest} request The
+ * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest} request The
  *     request proto
  * @param {?Object<string, string>} metadata User defined
  *     call metadata
- * @param {function(?grpc.web.RpcError, ?proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse)}
+ * @param {function(?grpc.web.RpcError, ?proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse)}
  *     callback The callback function(error, response)
- * @return {!grpc.web.ClientReadableStream<!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse>|undefined}
+ * @return {!grpc.web.ClientReadableStream<!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse>|undefined}
  *     The XHR Node Readable Stream
  */
-proto.services.tasks_svc.v1.TaskTemplateServiceClient.prototype.getAllTaskTemplatesByWard =
+proto.services.tasks_svc.v1.TaskTemplateServiceClient.prototype.getAllTaskTemplates =
     function(request, metadata, callback) {
   return this.client_.rpcCall(this.hostname_ +
-      '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplatesByWard',
+      '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplates',
       request,
       metadata || {},
-      methodDescriptor_TaskTemplateService_GetAllTaskTemplatesByWard,
+      methodDescriptor_TaskTemplateService_GetAllTaskTemplates,
       callback);
 };
 
 
 /**
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest} request The
+ * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest} request The
  *     request proto
  * @param {?Object<string, string>=} metadata User defined
  *     call metadata
- * @return {!Promise<!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse>}
+ * @return {!Promise<!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse>}
  *     Promise that resolves to the response
  */
-proto.services.tasks_svc.v1.TaskTemplateServicePromiseClient.prototype.getAllTaskTemplatesByWard =
+proto.services.tasks_svc.v1.TaskTemplateServicePromiseClient.prototype.getAllTaskTemplates =
     function(request, metadata) {
   return this.client_.unaryCall(this.hostname_ +
-      '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplatesByWard',
+      '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplates',
       request,
       metadata || {},
-      methodDescriptor_TaskTemplateService_GetAllTaskTemplatesByWard);
+      methodDescriptor_TaskTemplateService_GetAllTaskTemplates);
 };
 
 
diff --git a/gen/ts/services/tasks_svc/v1/task_template_svc_pb.d.ts b/gen/ts/services/tasks_svc/v1/task_template_svc_pb.d.ts
index 093bcba77..9e3631616 100644
--- a/gen/ts/services/tasks_svc/v1/task_template_svc_pb.d.ts
+++ b/gen/ts/services/tasks_svc/v1/task_template_svc_pb.d.ts
@@ -85,108 +85,6 @@ export namespace CreateTaskTemplateResponse {
   }
 }
 
-export class GetAllTaskTemplatesRequest extends jspb.Message {
-  serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): GetAllTaskTemplatesRequest.AsObject;
-  static toObject(includeInstance: boolean, msg: GetAllTaskTemplatesRequest): GetAllTaskTemplatesRequest.AsObject;
-  static serializeBinaryToWriter(message: GetAllTaskTemplatesRequest, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): GetAllTaskTemplatesRequest;
-  static deserializeBinaryFromReader(message: GetAllTaskTemplatesRequest, reader: jspb.BinaryReader): GetAllTaskTemplatesRequest;
-}
-
-export namespace GetAllTaskTemplatesRequest {
-  export type AsObject = {
-  }
-}
-
-export class GetAllTaskTemplatesResponse extends jspb.Message {
-  getTemplatesList(): Array<GetAllTaskTemplatesResponse.TaskTemplate>;
-  setTemplatesList(value: Array<GetAllTaskTemplatesResponse.TaskTemplate>): GetAllTaskTemplatesResponse;
-  clearTemplatesList(): GetAllTaskTemplatesResponse;
-  addTemplates(value?: GetAllTaskTemplatesResponse.TaskTemplate, index?: number): GetAllTaskTemplatesResponse.TaskTemplate;
-
-  serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): GetAllTaskTemplatesResponse.AsObject;
-  static toObject(includeInstance: boolean, msg: GetAllTaskTemplatesResponse): GetAllTaskTemplatesResponse.AsObject;
-  static serializeBinaryToWriter(message: GetAllTaskTemplatesResponse, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): GetAllTaskTemplatesResponse;
-  static deserializeBinaryFromReader(message: GetAllTaskTemplatesResponse, reader: jspb.BinaryReader): GetAllTaskTemplatesResponse;
-}
-
-export namespace GetAllTaskTemplatesResponse {
-  export type AsObject = {
-    templatesList: Array<GetAllTaskTemplatesResponse.TaskTemplate.AsObject>,
-  }
-
-  export class TaskTemplate extends jspb.Message {
-    getId(): string;
-    setId(value: string): TaskTemplate;
-
-    getName(): string;
-    setName(value: string): TaskTemplate;
-
-    getDescription(): string;
-    setDescription(value: string): TaskTemplate;
-
-    getIsPublic(): boolean;
-    setIsPublic(value: boolean): TaskTemplate;
-
-    getCreatedBy(): string;
-    setCreatedBy(value: string): TaskTemplate;
-
-    getSubtasksList(): Array<GetAllTaskTemplatesResponse.TaskTemplate.SubTask>;
-    setSubtasksList(value: Array<GetAllTaskTemplatesResponse.TaskTemplate.SubTask>): TaskTemplate;
-    clearSubtasksList(): TaskTemplate;
-    addSubtasks(value?: GetAllTaskTemplatesResponse.TaskTemplate.SubTask, index?: number): GetAllTaskTemplatesResponse.TaskTemplate.SubTask;
-
-    serializeBinary(): Uint8Array;
-    toObject(includeInstance?: boolean): TaskTemplate.AsObject;
-    static toObject(includeInstance: boolean, msg: TaskTemplate): TaskTemplate.AsObject;
-    static serializeBinaryToWriter(message: TaskTemplate, writer: jspb.BinaryWriter): void;
-    static deserializeBinary(bytes: Uint8Array): TaskTemplate;
-    static deserializeBinaryFromReader(message: TaskTemplate, reader: jspb.BinaryReader): TaskTemplate;
-  }
-
-  export namespace TaskTemplate {
-    export type AsObject = {
-      id: string,
-      name: string,
-      description: string,
-      isPublic: boolean,
-      createdBy: string,
-      subtasksList: Array<GetAllTaskTemplatesResponse.TaskTemplate.SubTask.AsObject>,
-    }
-
-    export class SubTask extends jspb.Message {
-      getId(): string;
-      setId(value: string): SubTask;
-
-      getTaskTemplateId(): string;
-      setTaskTemplateId(value: string): SubTask;
-
-      getName(): string;
-      setName(value: string): SubTask;
-
-      serializeBinary(): Uint8Array;
-      toObject(includeInstance?: boolean): SubTask.AsObject;
-      static toObject(includeInstance: boolean, msg: SubTask): SubTask.AsObject;
-      static serializeBinaryToWriter(message: SubTask, writer: jspb.BinaryWriter): void;
-      static deserializeBinary(bytes: Uint8Array): SubTask;
-      static deserializeBinaryFromReader(message: SubTask, reader: jspb.BinaryReader): SubTask;
-    }
-
-    export namespace SubTask {
-      export type AsObject = {
-        id: string,
-        taskTemplateId: string,
-        name: string,
-      }
-    }
-
-  }
-
-}
-
 export class DeleteTaskTemplateRequest extends jspb.Message {
   getId(): string;
   setId(value: string): DeleteTaskTemplateRequest;
@@ -388,154 +286,63 @@ export namespace CreateTaskTemplateSubTaskResponse {
   }
 }
 
-export class GetAllTaskTemplatesByCreatorRequest extends jspb.Message {
+export class GetAllTaskTemplatesRequest extends jspb.Message {
+  getWardId(): string;
+  setWardId(value: string): GetAllTaskTemplatesRequest;
+  hasWardId(): boolean;
+  clearWardId(): GetAllTaskTemplatesRequest;
+
   getCreatedBy(): string;
-  setCreatedBy(value: string): GetAllTaskTemplatesByCreatorRequest;
+  setCreatedBy(value: string): GetAllTaskTemplatesRequest;
+  hasCreatedBy(): boolean;
+  clearCreatedBy(): GetAllTaskTemplatesRequest;
 
   getPrivateOnly(): boolean;
-  setPrivateOnly(value: boolean): GetAllTaskTemplatesByCreatorRequest;
-  hasPrivateOnly(): boolean;
-  clearPrivateOnly(): GetAllTaskTemplatesByCreatorRequest;
-
-  serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): GetAllTaskTemplatesByCreatorRequest.AsObject;
-  static toObject(includeInstance: boolean, msg: GetAllTaskTemplatesByCreatorRequest): GetAllTaskTemplatesByCreatorRequest.AsObject;
-  static serializeBinaryToWriter(message: GetAllTaskTemplatesByCreatorRequest, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): GetAllTaskTemplatesByCreatorRequest;
-  static deserializeBinaryFromReader(message: GetAllTaskTemplatesByCreatorRequest, reader: jspb.BinaryReader): GetAllTaskTemplatesByCreatorRequest;
-}
-
-export namespace GetAllTaskTemplatesByCreatorRequest {
-  export type AsObject = {
-    createdBy: string,
-    privateOnly?: boolean,
-  }
-
-  export enum PrivateOnlyCase { 
-    _PRIVATE_ONLY_NOT_SET = 0,
-    PRIVATE_ONLY = 2,
-  }
-}
-
-export class GetAllTaskTemplatesByCreatorResponse extends jspb.Message {
-  getTemplatesList(): Array<GetAllTaskTemplatesByCreatorResponse.TaskTemplate>;
-  setTemplatesList(value: Array<GetAllTaskTemplatesByCreatorResponse.TaskTemplate>): GetAllTaskTemplatesByCreatorResponse;
-  clearTemplatesList(): GetAllTaskTemplatesByCreatorResponse;
-  addTemplates(value?: GetAllTaskTemplatesByCreatorResponse.TaskTemplate, index?: number): GetAllTaskTemplatesByCreatorResponse.TaskTemplate;
+  setPrivateOnly(value: boolean): GetAllTaskTemplatesRequest;
 
   serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): GetAllTaskTemplatesByCreatorResponse.AsObject;
-  static toObject(includeInstance: boolean, msg: GetAllTaskTemplatesByCreatorResponse): GetAllTaskTemplatesByCreatorResponse.AsObject;
-  static serializeBinaryToWriter(message: GetAllTaskTemplatesByCreatorResponse, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): GetAllTaskTemplatesByCreatorResponse;
-  static deserializeBinaryFromReader(message: GetAllTaskTemplatesByCreatorResponse, reader: jspb.BinaryReader): GetAllTaskTemplatesByCreatorResponse;
+  toObject(includeInstance?: boolean): GetAllTaskTemplatesRequest.AsObject;
+  static toObject(includeInstance: boolean, msg: GetAllTaskTemplatesRequest): GetAllTaskTemplatesRequest.AsObject;
+  static serializeBinaryToWriter(message: GetAllTaskTemplatesRequest, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): GetAllTaskTemplatesRequest;
+  static deserializeBinaryFromReader(message: GetAllTaskTemplatesRequest, reader: jspb.BinaryReader): GetAllTaskTemplatesRequest;
 }
 
-export namespace GetAllTaskTemplatesByCreatorResponse {
+export namespace GetAllTaskTemplatesRequest {
   export type AsObject = {
-    templatesList: Array<GetAllTaskTemplatesByCreatorResponse.TaskTemplate.AsObject>,
-  }
-
-  export class TaskTemplate extends jspb.Message {
-    getId(): string;
-    setId(value: string): TaskTemplate;
-
-    getName(): string;
-    setName(value: string): TaskTemplate;
-
-    getDescription(): string;
-    setDescription(value: string): TaskTemplate;
-
-    getIsPublic(): boolean;
-    setIsPublic(value: boolean): TaskTemplate;
-
-    getSubtasksList(): Array<GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask>;
-    setSubtasksList(value: Array<GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask>): TaskTemplate;
-    clearSubtasksList(): TaskTemplate;
-    addSubtasks(value?: GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask, index?: number): GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask;
-
-    serializeBinary(): Uint8Array;
-    toObject(includeInstance?: boolean): TaskTemplate.AsObject;
-    static toObject(includeInstance: boolean, msg: TaskTemplate): TaskTemplate.AsObject;
-    static serializeBinaryToWriter(message: TaskTemplate, writer: jspb.BinaryWriter): void;
-    static deserializeBinary(bytes: Uint8Array): TaskTemplate;
-    static deserializeBinaryFromReader(message: TaskTemplate, reader: jspb.BinaryReader): TaskTemplate;
+    wardId?: string,
+    createdBy?: string,
+    privateOnly: boolean,
   }
 
-  export namespace TaskTemplate {
-    export type AsObject = {
-      id: string,
-      name: string,
-      description: string,
-      isPublic: boolean,
-      subtasksList: Array<GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.AsObject>,
-    }
-
-    export class SubTask extends jspb.Message {
-      getId(): string;
-      setId(value: string): SubTask;
-
-      getTaskTemplateId(): string;
-      setTaskTemplateId(value: string): SubTask;
-
-      getName(): string;
-      setName(value: string): SubTask;
-
-      serializeBinary(): Uint8Array;
-      toObject(includeInstance?: boolean): SubTask.AsObject;
-      static toObject(includeInstance: boolean, msg: SubTask): SubTask.AsObject;
-      static serializeBinaryToWriter(message: SubTask, writer: jspb.BinaryWriter): void;
-      static deserializeBinary(bytes: Uint8Array): SubTask;
-      static deserializeBinaryFromReader(message: SubTask, reader: jspb.BinaryReader): SubTask;
-    }
-
-    export namespace SubTask {
-      export type AsObject = {
-        id: string,
-        taskTemplateId: string,
-        name: string,
-      }
-    }
-
+  export enum WardIdCase { 
+    _WARD_ID_NOT_SET = 0,
+    WARD_ID = 1,
   }
 
-}
-
-export class GetAllTaskTemplatesByWardRequest extends jspb.Message {
-  getWardId(): string;
-  setWardId(value: string): GetAllTaskTemplatesByWardRequest;
-
-  serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): GetAllTaskTemplatesByWardRequest.AsObject;
-  static toObject(includeInstance: boolean, msg: GetAllTaskTemplatesByWardRequest): GetAllTaskTemplatesByWardRequest.AsObject;
-  static serializeBinaryToWriter(message: GetAllTaskTemplatesByWardRequest, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): GetAllTaskTemplatesByWardRequest;
-  static deserializeBinaryFromReader(message: GetAllTaskTemplatesByWardRequest, reader: jspb.BinaryReader): GetAllTaskTemplatesByWardRequest;
-}
-
-export namespace GetAllTaskTemplatesByWardRequest {
-  export type AsObject = {
-    wardId: string,
+  export enum CreatedByCase { 
+    _CREATED_BY_NOT_SET = 0,
+    CREATED_BY = 2,
   }
 }
 
-export class GetAllTaskTemplatesByWardResponse extends jspb.Message {
-  getTemplatesList(): Array<GetAllTaskTemplatesByWardResponse.TaskTemplate>;
-  setTemplatesList(value: Array<GetAllTaskTemplatesByWardResponse.TaskTemplate>): GetAllTaskTemplatesByWardResponse;
-  clearTemplatesList(): GetAllTaskTemplatesByWardResponse;
-  addTemplates(value?: GetAllTaskTemplatesByWardResponse.TaskTemplate, index?: number): GetAllTaskTemplatesByWardResponse.TaskTemplate;
+export class GetAllTaskTemplatesResponse extends jspb.Message {
+  getTemplatesList(): Array<GetAllTaskTemplatesResponse.TaskTemplate>;
+  setTemplatesList(value: Array<GetAllTaskTemplatesResponse.TaskTemplate>): GetAllTaskTemplatesResponse;
+  clearTemplatesList(): GetAllTaskTemplatesResponse;
+  addTemplates(value?: GetAllTaskTemplatesResponse.TaskTemplate, index?: number): GetAllTaskTemplatesResponse.TaskTemplate;
 
   serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): GetAllTaskTemplatesByWardResponse.AsObject;
-  static toObject(includeInstance: boolean, msg: GetAllTaskTemplatesByWardResponse): GetAllTaskTemplatesByWardResponse.AsObject;
-  static serializeBinaryToWriter(message: GetAllTaskTemplatesByWardResponse, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): GetAllTaskTemplatesByWardResponse;
-  static deserializeBinaryFromReader(message: GetAllTaskTemplatesByWardResponse, reader: jspb.BinaryReader): GetAllTaskTemplatesByWardResponse;
+  toObject(includeInstance?: boolean): GetAllTaskTemplatesResponse.AsObject;
+  static toObject(includeInstance: boolean, msg: GetAllTaskTemplatesResponse): GetAllTaskTemplatesResponse.AsObject;
+  static serializeBinaryToWriter(message: GetAllTaskTemplatesResponse, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): GetAllTaskTemplatesResponse;
+  static deserializeBinaryFromReader(message: GetAllTaskTemplatesResponse, reader: jspb.BinaryReader): GetAllTaskTemplatesResponse;
 }
 
-export namespace GetAllTaskTemplatesByWardResponse {
+export namespace GetAllTaskTemplatesResponse {
   export type AsObject = {
-    templatesList: Array<GetAllTaskTemplatesByWardResponse.TaskTemplate.AsObject>,
+    templatesList: Array<GetAllTaskTemplatesResponse.TaskTemplate.AsObject>,
   }
 
   export class TaskTemplate extends jspb.Message {
@@ -554,10 +361,10 @@ export namespace GetAllTaskTemplatesByWardResponse {
     getCreatedBy(): string;
     setCreatedBy(value: string): TaskTemplate;
 
-    getSubtasksList(): Array<GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask>;
-    setSubtasksList(value: Array<GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask>): TaskTemplate;
+    getSubtasksList(): Array<GetAllTaskTemplatesResponse.TaskTemplate.SubTask>;
+    setSubtasksList(value: Array<GetAllTaskTemplatesResponse.TaskTemplate.SubTask>): TaskTemplate;
     clearSubtasksList(): TaskTemplate;
-    addSubtasks(value?: GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask, index?: number): GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask;
+    addSubtasks(value?: GetAllTaskTemplatesResponse.TaskTemplate.SubTask, index?: number): GetAllTaskTemplatesResponse.TaskTemplate.SubTask;
 
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): TaskTemplate.AsObject;
@@ -574,7 +381,7 @@ export namespace GetAllTaskTemplatesByWardResponse {
       description: string,
       isPublic: boolean,
       createdBy: string,
-      subtasksList: Array<GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.AsObject>,
+      subtasksList: Array<GetAllTaskTemplatesResponse.TaskTemplate.SubTask.AsObject>,
     }
 
     export class SubTask extends jspb.Message {
diff --git a/gen/ts/services/tasks_svc/v1/task_template_svc_pb.js b/gen/ts/services/tasks_svc/v1/task_template_svc_pb.js
index f90008816..7be751486 100644
--- a/gen/ts/services/tasks_svc/v1/task_template_svc_pb.js
+++ b/gen/ts/services/tasks_svc/v1/task_template_svc_pb.js
@@ -30,14 +30,6 @@ goog.exportSymbol('proto.services.tasks_svc.v1.DeleteTaskTemplateRequest', null,
 goog.exportSymbol('proto.services.tasks_svc.v1.DeleteTaskTemplateResponse', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse', null, global);
-goog.exportSymbol('proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest', null, global);
-goog.exportSymbol('proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse', null, global);
-goog.exportSymbol('proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate', null, global);
-goog.exportSymbol('proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask', null, global);
-goog.exportSymbol('proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest', null, global);
-goog.exportSymbol('proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse', null, global);
-goog.exportSymbol('proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate', null, global);
-goog.exportSymbol('proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse', null, global);
 goog.exportSymbol('proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate', null, global);
@@ -109,90 +101,6 @@ if (goog.DEBUG && !COMPILED) {
    */
   proto.services.tasks_svc.v1.CreateTaskTemplateResponse.displayName = 'proto.services.tasks_svc.v1.CreateTaskTemplateResponse';
 }
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  /**
-   * @public
-   * @override
-   */
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.displayName = 'proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest';
-}
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.repeatedFields_, null);
-};
-goog.inherits(proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  /**
-   * @public
-   * @override
-   */
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.displayName = 'proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse';
-}
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.repeatedFields_, null);
-};
-goog.inherits(proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  /**
-   * @public
-   * @override
-   */
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.displayName = 'proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate';
-}
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  /**
-   * @public
-   * @override
-   */
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.displayName = 'proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask';
-}
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -413,100 +321,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  /**
-   * @public
-   * @override
-   */
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.displayName = 'proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest';
-}
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.repeatedFields_, null);
-};
-goog.inherits(proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  /**
-   * @public
-   * @override
-   */
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.displayName = 'proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse';
-}
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.repeatedFields_, null);
-};
-goog.inherits(proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  /**
-   * @public
-   * @override
-   */
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.displayName = 'proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate';
-}
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  /**
-   * @public
-   * @override
-   */
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.displayName = 'proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask';
-}
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest = function(opt_data) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest, jspb.Message);
+goog.inherits(proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.displayName = 'proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest';
+  proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.displayName = 'proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -518,16 +342,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.repeatedFields_, null);
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.repeatedFields_, null);
 };
-goog.inherits(proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse, jspb.Message);
+goog.inherits(proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.displayName = 'proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse';
+  proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.displayName = 'proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -539,16 +363,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.repeatedFields_, null);
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.repeatedFields_, null);
 };
-goog.inherits(proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate, jspb.Message);
+goog.inherits(proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.displayName = 'proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate';
+  proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.displayName = 'proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -560,16 +384,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask = function(opt_data) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask, jspb.Message);
+goog.inherits(proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.displayName = 'proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask';
+  proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.displayName = 'proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask';
 }
 
 /**
@@ -1133,8 +957,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.toObject(opt_includeInstance, this);
 };
 
 
@@ -1143,13 +967,13 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.prototype.toObject = func
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateRequest} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
-
+    id: jspb.Message.getFieldWithDefault(msg, 1, "")
   };
 
   if (includeInstance) {
@@ -1163,29 +987,33 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.toObject = function(inclu
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest}
+ * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateRequest}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest;
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.DeleteTaskTemplateRequest;
+  return proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateRequest} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest}
+ * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateRequest}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
     }
     var field = reader.getFieldNumber();
     switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setId(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -1199,9 +1027,9 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.deserializeBinaryFromRead
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -1209,22 +1037,40 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.prototype.serializeBinary
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest} message
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateRequest} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
+  f = message.getId();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
 };
 
 
+/**
+ * optional string id = 1;
+ * @return {string}
+ */
+proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.prototype.getId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+
 
 /**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
+ * @param {string} value
+ * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateRequest} returns this
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.repeatedFields_ = [1];
+proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.prototype.setId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
+};
+
+
 
 
 
@@ -1241,8 +1087,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.DeleteTaskTemplateResponse.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.DeleteTaskTemplateResponse.toObject(opt_includeInstance, this);
 };
 
 
@@ -1251,14 +1097,13 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.prototype.toObject = fun
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateResponse} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.DeleteTaskTemplateResponse.toObject = function(includeInstance, msg) {
   var f, obj = {
-    templatesList: jspb.Message.toObjectList(msg.getTemplatesList(),
-    proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.toObject, includeInstance)
+
   };
 
   if (includeInstance) {
@@ -1272,1363 +1117,23 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.toObject = function(incl
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse}
+ * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateResponse}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.DeleteTaskTemplateResponse.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse;
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.DeleteTaskTemplateResponse;
+  return proto.services.tasks_svc.v1.DeleteTaskTemplateResponse.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateResponse} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse}
+ * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateResponse}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate;
-      reader.readMessage(value,proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.deserializeBinaryFromReader);
-      msg.addTemplates(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getTemplatesList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.serializeBinaryToWriter
-    );
-  }
-};
-
-
-
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.repeatedFields_ = [7];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * Optional fields that are not set will be set to undefined.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
- * @param {boolean=} opt_includeInstance Deprecated. whether to include the
- *     JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Deprecated. Whether to include
- *     the JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    name: jspb.Message.getFieldWithDefault(msg, 2, ""),
-    description: jspb.Message.getFieldWithDefault(msg, 3, ""),
-    isPublic: jspb.Message.getBooleanFieldWithDefault(msg, 4, false),
-    createdBy: jspb.Message.getFieldWithDefault(msg, 6, ""),
-    subtasksList: jspb.Message.toObjectList(msg.getSubtasksList(),
-    proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate;
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setName(value);
-      break;
-    case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setDescription(value);
-      break;
-    case 4:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setIsPublic(value);
-      break;
-    case 6:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setCreatedBy(value);
-      break;
-    case 7:
-      var value = new proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask;
-      reader.readMessage(value,proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.deserializeBinaryFromReader);
-      msg.addSubtasks(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getName();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-  f = message.getDescription();
-  if (f.length > 0) {
-    writer.writeString(
-      3,
-      f
-    );
-  }
-  f = message.getIsPublic();
-  if (f) {
-    writer.writeBool(
-      4,
-      f
-    );
-  }
-  f = message.getCreatedBy();
-  if (f.length > 0) {
-    writer.writeString(
-      6,
-      f
-    );
-  }
-  f = message.getSubtasksList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      7,
-      f,
-      proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.serializeBinaryToWriter
-    );
-  }
-};
-
-
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * Optional fields that are not set will be set to undefined.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
- * @param {boolean=} opt_includeInstance Deprecated. whether to include the
- *     JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Deprecated. Whether to include
- *     the JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    taskTemplateId: jspb.Message.getFieldWithDefault(msg, 2, ""),
-    name: jspb.Message.getFieldWithDefault(msg, 3, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask;
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setTaskTemplateId(value);
-      break;
-    case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setName(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getTaskTemplateId();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-  f = message.getName();
-  if (f.length > 0) {
-    writer.writeString(
-      3,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask} returns this
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.prototype.setId = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
-};
-
-
-/**
- * optional string task_template_id = 2;
- * @return {string}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.prototype.getTaskTemplateId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask} returns this
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.prototype.setTaskTemplateId = function(value) {
-  return jspb.Message.setProto3StringField(this, 2, value);
-};
-
-
-/**
- * optional string name = 3;
- * @return {string}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.prototype.getName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask} returns this
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.prototype.setName = function(value) {
-  return jspb.Message.setProto3StringField(this, 3, value);
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} returns this
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.setId = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
-};
-
-
-/**
- * optional string name = 2;
- * @return {string}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.getName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} returns this
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.setName = function(value) {
-  return jspb.Message.setProto3StringField(this, 2, value);
-};
-
-
-/**
- * optional string description = 3;
- * @return {string}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.getDescription = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} returns this
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.setDescription = function(value) {
-  return jspb.Message.setProto3StringField(this, 3, value);
-};
-
-
-/**
- * optional bool is_public = 4;
- * @return {boolean}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.getIsPublic = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 4, false));
-};
-
-
-/**
- * @param {boolean} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} returns this
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.setIsPublic = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 4, value);
-};
-
-
-/**
- * optional string created_by = 6;
- * @return {string}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.getCreatedBy = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} returns this
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.setCreatedBy = function(value) {
-  return jspb.Message.setProto3StringField(this, 6, value);
-};
-
-
-/**
- * repeated SubTask subtasks = 7;
- * @return {!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask>}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.getSubtasksList = function() {
-  return /** @type{!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask, 7));
-};
-
-
-/**
- * @param {!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask>} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} returns this
-*/
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.setSubtasksList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 7, value);
-};
-
-
-/**
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask=} opt_value
- * @param {number=} opt_index
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.addSubtasks = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 7, opt_value, proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask, opt_index);
-};
-
-
-/**
- * Clears the list making it empty but non-null.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} returns this
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.clearSubtasksList = function() {
-  return this.setSubtasksList([]);
-};
-
-
-/**
- * repeated TaskTemplate templates = 1;
- * @return {!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate>}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.prototype.getTemplatesList = function() {
-  return /** @type{!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate, 1));
-};
-
-
-/**
- * @param {!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate>} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse} returns this
-*/
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.prototype.setTemplatesList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 1, value);
-};
-
-
-/**
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate=} opt_value
- * @param {number=} opt_index
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.prototype.addTemplates = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate, opt_index);
-};
-
-
-/**
- * Clears the list making it empty but non-null.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse} returns this
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.prototype.clearTemplatesList = function() {
-  return this.setTemplatesList([]);
-};
-
-
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * Optional fields that are not set will be set to undefined.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
- * @param {boolean=} opt_includeInstance Deprecated. whether to include the
- *     JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Deprecated. Whether to include
- *     the JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateRequest} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateRequest}
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.DeleteTaskTemplateRequest;
-  return proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateRequest} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateRequest}
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateRequest} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateRequest} returns this
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateRequest.prototype.setId = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
-};
-
-
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * Optional fields that are not set will be set to undefined.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
- * @param {boolean=} opt_includeInstance Deprecated. whether to include the
- *     JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.DeleteTaskTemplateResponse.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Deprecated. Whether to include
- *     the JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateResponse} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateResponse.toObject = function(includeInstance, msg) {
-  var f, obj = {
-
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateResponse}
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateResponse.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.DeleteTaskTemplateResponse;
-  return proto.services.tasks_svc.v1.DeleteTaskTemplateResponse.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateResponse} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateResponse}
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateResponse.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateResponse.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.DeleteTaskTemplateResponse.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateResponse} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateResponse.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-};
-
-
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * Optional fields that are not set will be set to undefined.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
- * @param {boolean=} opt_includeInstance Deprecated. whether to include the
- *     JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Deprecated. Whether to include
- *     the JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest}
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest;
-  return proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest}
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest} returns this
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.prototype.setId = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
-};
-
-
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * Optional fields that are not set will be set to undefined.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
- * @param {boolean=} opt_includeInstance Deprecated. whether to include the
- *     JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Deprecated. Whether to include
- *     the JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse.toObject = function(includeInstance, msg) {
-  var f, obj = {
-
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse}
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse;
-  return proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse}
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-};
-
-
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * Optional fields that are not set will be set to undefined.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
- * @param {boolean=} opt_includeInstance Deprecated. whether to include the
- *     JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Deprecated. Whether to include
- *     the JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    name: jspb.Message.getFieldWithDefault(msg, 2, ""),
-    description: jspb.Message.getFieldWithDefault(msg, 3, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest}
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.UpdateTaskTemplateRequest;
-  return proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest}
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setName(value);
-      break;
-    case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setDescription(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = /** @type {string} */ (jspb.Message.getField(message, 2));
-  if (f != null) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-  f = /** @type {string} */ (jspb.Message.getField(message, 3));
-  if (f != null) {
-    writer.writeString(
-      3,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest} returns this
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.setId = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
-};
-
-
-/**
- * optional string name = 2;
- * @return {string}
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.getName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest} returns this
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.setName = function(value) {
-  return jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * Clears the field making it undefined.
- * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest} returns this
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.clearName = function() {
-  return jspb.Message.setField(this, 2, undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.hasName = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional string description = 3;
- * @return {string}
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.getDescription = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest} returns this
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.setDescription = function(value) {
-  return jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * Clears the field making it undefined.
- * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest} returns this
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.clearDescription = function() {
-  return jspb.Message.setField(this, 3, undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.hasDescription = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * Optional fields that are not set will be set to undefined.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
- * @param {boolean=} opt_includeInstance Deprecated. whether to include the
- *     JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Deprecated. Whether to include
- *     the JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateResponse} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.toObject = function(includeInstance, msg) {
-  var f, obj = {
-
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateResponse}
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.UpdateTaskTemplateResponse;
-  return proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateResponse} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateResponse}
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.DeleteTaskTemplateResponse.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -2648,9 +1153,9 @@ proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.deserializeBinaryFromRead
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.DeleteTaskTemplateResponse.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.DeleteTaskTemplateResponse.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -2658,11 +1163,11 @@ proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.prototype.serializeBinary
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateResponse} message
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateResponse} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.DeleteTaskTemplateResponse.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
 };
 
@@ -2683,8 +1188,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.toObject(opt_includeInstance, this);
 };
 
 
@@ -2693,14 +1198,13 @@ proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.prototype.toObject
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
-    subtaskId: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    name: jspb.Message.getFieldWithDefault(msg, 2, "")
+    id: jspb.Message.getFieldWithDefault(msg, 1, "")
   };
 
   if (includeInstance) {
@@ -2714,23 +1218,23 @@ proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.toObject = function
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest}
+ * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest}
  */
-proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest;
-  return proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest;
+  return proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest}
+ * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest}
  */
-proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -2739,11 +1243,7 @@ proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.deserializeBinaryFr
     switch (field) {
     case 1:
       var value = /** @type {string} */ (reader.readString());
-      msg.setSubtaskId(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setName(value);
+      msg.setId(value);
       break;
     default:
       reader.skipField();
@@ -2758,9 +1258,9 @@ proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.deserializeBinaryFr
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -2768,83 +1268,40 @@ proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.prototype.serialize
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest} message
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getSubtaskId();
+  f = message.getId();
   if (f.length > 0) {
     writer.writeString(
       1,
       f
     );
   }
-  f = /** @type {string} */ (jspb.Message.getField(message, 2));
-  if (f != null) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
 };
 
 
 /**
- * optional string subtask_id = 1;
+ * optional string id = 1;
  * @return {string}
  */
-proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.prototype.getSubtaskId = function() {
+proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.prototype.getId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest} returns this
+ * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest} returns this
  */
-proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.prototype.setSubtaskId = function(value) {
+proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest.prototype.setId = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 
 
-/**
- * optional string name = 2;
- * @return {string}
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.prototype.getName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest} returns this
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.prototype.setName = function(value) {
-  return jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * Clears the field making it undefined.
- * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest} returns this
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.prototype.clearName = function() {
-  return jspb.Message.setField(this, 2, undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.prototype.hasName = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
 
 
 
@@ -2861,8 +1318,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse.toObject(opt_includeInstance, this);
 };
 
 
@@ -2871,11 +1328,11 @@ proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.prototype.toObject
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse.toObject = function(includeInstance, msg) {
   var f, obj = {
 
   };
@@ -2891,23 +1348,23 @@ proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.toObject = functio
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse}
+ * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse}
  */
-proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse;
-  return proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse;
+  return proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse}
+ * @return {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse}
  */
-proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -2927,9 +1384,9 @@ proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.deserializeBinaryF
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -2937,11 +1394,11 @@ proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.prototype.serializ
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse} message
+ * @param {!proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
 };
 
@@ -2962,8 +1419,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.toObject(opt_includeInstance, this);
 };
 
 
@@ -2972,14 +1429,15 @@ proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.prototype.toObject
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
-    taskTemplateId: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    name: jspb.Message.getFieldWithDefault(msg, 2, "")
+    id: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    name: jspb.Message.getFieldWithDefault(msg, 2, ""),
+    description: jspb.Message.getFieldWithDefault(msg, 3, "")
   };
 
   if (includeInstance) {
@@ -2993,23 +1451,23 @@ proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.toObject = function
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest}
+ * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest}
  */
-proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest;
-  return proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.UpdateTaskTemplateRequest;
+  return proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest}
+ * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest}
  */
-proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -3018,12 +1476,16 @@ proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.deserializeBinaryFr
     switch (field) {
     case 1:
       var value = /** @type {string} */ (reader.readString());
-      msg.setTaskTemplateId(value);
+      msg.setId(value);
       break;
     case 2:
       var value = /** @type {string} */ (reader.readString());
       msg.setName(value);
       break;
+    case 3:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setDescription(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -3037,72 +1499,133 @@ proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.deserializeBinaryFr
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
 
 /**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getId();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
+  f = /** @type {string} */ (jspb.Message.getField(message, 2));
+  if (f != null) {
+    writer.writeString(
+      2,
+      f
+    );
+  }
+  f = /** @type {string} */ (jspb.Message.getField(message, 3));
+  if (f != null) {
+    writer.writeString(
+      3,
+      f
+    );
+  }
+};
+
+
+/**
+ * optional string id = 1;
+ * @return {string}
+ */
+proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.getId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest} returns this
+ */
+proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.setId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
+};
+
+
+/**
+ * optional string name = 2;
+ * @return {string}
+ */
+proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.getName = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest} returns this
+ */
+proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.setName = function(value) {
+  return jspb.Message.setField(this, 2, value);
+};
+
+
+/**
+ * Clears the field making it undefined.
+ * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest} returns this
+ */
+proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.clearName = function() {
+  return jspb.Message.setField(this, 2, undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
  */
-proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getTaskTemplateId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getName();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
+proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.hasName = function() {
+  return jspb.Message.getField(this, 2) != null;
 };
 
 
 /**
- * optional string task_template_id = 1;
+ * optional string description = 3;
  * @return {string}
  */
-proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.prototype.getTaskTemplateId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.getDescription = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest} returns this
+ * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest} returns this
  */
-proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.prototype.setTaskTemplateId = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
+proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.setDescription = function(value) {
+  return jspb.Message.setField(this, 3, value);
 };
 
 
 /**
- * optional string name = 2;
- * @return {string}
+ * Clears the field making it undefined.
+ * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateRequest} returns this
  */
-proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.prototype.getName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
+proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.clearDescription = function() {
+  return jspb.Message.setField(this, 3, undefined);
 };
 
 
 /**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest} returns this
+ * Returns whether this field is set.
+ * @return {boolean}
  */
-proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.prototype.setName = function(value) {
-  return jspb.Message.setProto3StringField(this, 2, value);
+proto.services.tasks_svc.v1.UpdateTaskTemplateRequest.prototype.hasDescription = function() {
+  return jspb.Message.getField(this, 3) != null;
 };
 
 
@@ -3122,8 +1645,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.toObject(opt_includeInstance, this);
 };
 
 
@@ -3132,13 +1655,13 @@ proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.prototype.toObject
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateResponse} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.toObject = function(includeInstance, msg) {
   var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
+
   };
 
   if (includeInstance) {
@@ -3152,33 +1675,29 @@ proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.toObject = functio
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse}
+ * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateResponse}
  */
-proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse;
-  return proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.UpdateTaskTemplateResponse;
+  return proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateResponse} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse}
+ * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateResponse}
  */
-proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
     }
     var field = reader.getFieldNumber();
     switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
     default:
       reader.skipField();
       break;
@@ -3192,9 +1711,9 @@ proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.deserializeBinaryF
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -3202,37 +1721,12 @@ proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.prototype.serializ
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse} message
+ * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateResponse} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.UpdateTaskTemplateResponse.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse} returns this
- */
-proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.prototype.setId = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
 };
 
 
@@ -3252,8 +1746,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.toObject(opt_includeInstance, this);
 };
 
 
@@ -3262,14 +1756,14 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.prototype.toObje
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
-    createdBy: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    privateOnly: jspb.Message.getBooleanFieldWithDefault(msg, 2, false)
+    subtaskId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    name: jspb.Message.getFieldWithDefault(msg, 2, "")
   };
 
   if (includeInstance) {
@@ -3283,23 +1777,23 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.toObject = funct
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest}
+ * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest;
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest;
+  return proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest}
+ * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -3308,11 +1802,11 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.deserializeBinar
     switch (field) {
     case 1:
       var value = /** @type {string} */ (reader.readString());
-      msg.setCreatedBy(value);
+      msg.setSubtaskId(value);
       break;
     case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setPrivateOnly(value);
+      var value = /** @type {string} */ (reader.readString());
+      msg.setName(value);
       break;
     default:
       reader.skipField();
@@ -3327,9 +1821,9 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.deserializeBinar
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -3337,22 +1831,22 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.prototype.serial
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest} message
+ * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getCreatedBy();
+  f = message.getSubtaskId();
   if (f.length > 0) {
     writer.writeString(
       1,
       f
     );
   }
-  f = /** @type {boolean} */ (jspb.Message.getField(message, 2));
+  f = /** @type {string} */ (jspb.Message.getField(message, 2));
   if (f != null) {
-    writer.writeBool(
+    writer.writeString(
       2,
       f
     );
@@ -3361,189 +1855,60 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.serializeBinaryT
 
 
 /**
- * optional string created_by = 1;
+ * optional string subtask_id = 1;
  * @return {string}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.prototype.getCreatedBy = function() {
+proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.prototype.getSubtaskId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest} returns this
+ * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest} returns this
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.prototype.setCreatedBy = function(value) {
+proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.prototype.setSubtaskId = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 
 
 /**
- * optional bool private_only = 2;
- * @return {boolean}
+ * optional string name = 2;
+ * @return {string}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.prototype.getPrivateOnly = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 2, false));
+proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.prototype.getName = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
 /**
- * @param {boolean} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest} returns this
+ * @param {string} value
+ * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest} returns this
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.prototype.setPrivateOnly = function(value) {
+proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.prototype.setName = function(value) {
   return jspb.Message.setField(this, 2, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest} returns this
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.prototype.clearPrivateOnly = function() {
-  return jspb.Message.setField(this, 2, undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest.prototype.hasPrivateOnly = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.repeatedFields_ = [1];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * Optional fields that are not set will be set to undefined.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
- * @param {boolean=} opt_includeInstance Deprecated. whether to include the
- *     JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Deprecated. Whether to include
- *     the JSPB instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    templatesList: jspb.Message.toObjectList(msg.getTemplatesList(),
-    proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse;
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate;
-      reader.readMessage(value,proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.deserializeBinaryFromReader);
-      msg.addTemplates(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
+ * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest} returns this
+ */
+proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.prototype.clearName = function() {
+  return jspb.Message.setField(this, 2, undefined);
 };
 
 
 /**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
+ * Returns whether this field is set.
+ * @return {boolean}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getTemplatesList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.serializeBinaryToWriter
-    );
-  }
+proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest.prototype.hasName = function() {
+  return jspb.Message.getField(this, 2) != null;
 };
 
 
 
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.repeatedFields_ = [7];
-
 
 
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -3559,8 +1924,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.toObject(opt_includeInstance, this);
 };
 
 
@@ -3569,18 +1934,13 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.pr
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.toObject = function(includeInstance, msg) {
   var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    name: jspb.Message.getFieldWithDefault(msg, 2, ""),
-    description: jspb.Message.getFieldWithDefault(msg, 3, ""),
-    isPublic: jspb.Message.getBooleanFieldWithDefault(msg, 4, false),
-    subtasksList: jspb.Message.toObjectList(msg.getSubtasksList(),
-    proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.toObject, includeInstance)
+
   };
 
   if (includeInstance) {
@@ -3594,50 +1954,29 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.to
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate}
+ * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate;
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse;
+  return proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate}
+ * @return {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
     }
     var field = reader.getFieldNumber();
     switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setName(value);
-      break;
-    case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setDescription(value);
-      break;
-    case 4:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setIsPublic(value);
-      break;
-    case 7:
-      var value = new proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask;
-      reader.readMessage(value,proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.deserializeBinaryFromReader);
-      msg.addSubtasks(value);
-      break;
     default:
       reader.skipField();
       break;
@@ -3651,9 +1990,9 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.de
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -3661,48 +2000,12 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.pr
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate} message
+ * @param {!proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getName();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-  f = message.getDescription();
-  if (f.length > 0) {
-    writer.writeString(
-      3,
-      f
-    );
-  }
-  f = message.getIsPublic();
-  if (f) {
-    writer.writeBool(
-      4,
-      f
-    );
-  }
-  f = message.getSubtasksList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      7,
-      f,
-      proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.serializeBinaryToWriter
-    );
-  }
 };
 
 
@@ -3722,8 +2025,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.toObject(opt_includeInstance, this);
 };
 
 
@@ -3732,15 +2035,14 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.Su
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    taskTemplateId: jspb.Message.getFieldWithDefault(msg, 2, ""),
-    name: jspb.Message.getFieldWithDefault(msg, 3, "")
+    taskTemplateId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    name: jspb.Message.getFieldWithDefault(msg, 2, "")
   };
 
   if (includeInstance) {
@@ -3754,23 +2056,23 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.Su
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask}
+ * @return {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask;
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest;
+  return proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask}
+ * @return {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -3778,14 +2080,10 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.Su
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    case 2:
       var value = /** @type {string} */ (reader.readString());
       msg.setTaskTemplateId(value);
       break;
-    case 3:
+    case 2:
       var value = /** @type {string} */ (reader.readString());
       msg.setName(value);
       break;
@@ -3802,9 +2100,9 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.Su
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -3812,30 +2110,23 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.Su
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask} message
+ * @param {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
   f = message.getTaskTemplateId();
   if (f.length > 0) {
     writer.writeString(
-      2,
+      1,
       f
     );
   }
   f = message.getName();
   if (f.length > 0) {
     writer.writeString(
-      3,
+      2,
       f
     );
   }
@@ -3843,73 +2134,19 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.Su
 
 
 /**
- * optional string id = 1;
- * @return {string}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask} returns this
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.prototype.setId = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
-};
-
-
-/**
- * optional string task_template_id = 2;
- * @return {string}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.prototype.getTaskTemplateId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask} returns this
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.prototype.setTaskTemplateId = function(value) {
-  return jspb.Message.setProto3StringField(this, 2, value);
-};
-
-
-/**
- * optional string name = 3;
- * @return {string}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.prototype.getName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask} returns this
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask.prototype.setName = function(value) {
-  return jspb.Message.setProto3StringField(this, 3, value);
-};
-
-
-/**
- * optional string id = 1;
+ * optional string task_template_id = 1;
  * @return {string}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.prototype.getId = function() {
+proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.prototype.getTaskTemplateId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate} returns this
+ * @return {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest} returns this
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.prototype.setId = function(value) {
+proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.prototype.setTaskTemplateId = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 
@@ -3918,129 +2155,147 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.pr
  * optional string name = 2;
  * @return {string}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.prototype.getName = function() {
+proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.prototype.getName = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate} returns this
+ * @return {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest} returns this
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.prototype.setName = function(value) {
+proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest.prototype.setName = function(value) {
   return jspb.Message.setProto3StringField(this, 2, value);
 };
 
 
-/**
- * optional string description = 3;
- * @return {string}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.prototype.getDescription = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
 
-/**
- * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate} returns this
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.prototype.setDescription = function(value) {
-  return jspb.Message.setProto3StringField(this, 3, value);
-};
 
 
+if (jspb.Message.GENERATE_TO_OBJECT) {
 /**
- * optional bool is_public = 4;
- * @return {boolean}
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.prototype.getIsPublic = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 4, false));
+proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.toObject(opt_includeInstance, this);
 };
 
 
 /**
- * @param {boolean} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate} returns this
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.prototype.setIsPublic = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 4, value);
-};
-
+proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    id: jspb.Message.getFieldWithDefault(msg, 1, "")
+  };
 
-/**
- * repeated SubTask subtasks = 7;
- * @return {!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask>}
- */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.prototype.getSubtasksList = function() {
-  return /** @type{!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask, 7));
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
 };
+}
 
 
 /**
- * @param {!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask>} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate} returns this
-*/
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.prototype.setSubtasksList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 7, value);
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse}
+ */
+proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse;
+  return proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask=} opt_value
- * @param {number=} opt_index
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask}
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.prototype.addSubtasks = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 7, opt_value, proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTask, opt_index);
+proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setId(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
 };
 
 
 /**
- * Clears the list making it empty but non-null.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate} returns this
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.prototype.clearSubtasksList = function() {
-  return this.setSubtasksList([]);
+proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
 };
 
 
 /**
- * repeated TaskTemplate templates = 1;
- * @return {!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate>}
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.prototype.getTemplatesList = function() {
-  return /** @type{!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate, 1));
-};
-
-
-/**
- * @param {!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate>} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse} returns this
-*/
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.prototype.setTemplatesList = function(value) {
-  return jspb.Message.setRepeatedWrapperField(this, 1, value);
+proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getId();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
 };
 
 
 /**
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate=} opt_value
- * @param {number=} opt_index
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate}
+ * optional string id = 1;
+ * @return {string}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.prototype.addTemplates = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate, opt_index);
+proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.prototype.getId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
- * Clears the list making it empty but non-null.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse} returns this
+ * @param {string} value
+ * @return {!proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse} returns this
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.prototype.clearTemplatesList = function() {
-  return this.setTemplatesList([]);
+proto.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse.prototype.setId = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
 };
 
 
@@ -4060,8 +2315,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.toObject(opt_includeInstance, this);
 };
 
 
@@ -4070,13 +2325,15 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.prototype.toObject
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
-    wardId: jspb.Message.getFieldWithDefault(msg, 1, "")
+    wardId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    createdBy: jspb.Message.getFieldWithDefault(msg, 2, ""),
+    privateOnly: jspb.Message.getBooleanFieldWithDefault(msg, 3, false)
   };
 
   if (includeInstance) {
@@ -4090,23 +2347,23 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.toObject = function
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest}
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest;
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest;
+  return proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest}
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -4117,6 +2374,14 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.deserializeBinaryFr
       var value = /** @type {string} */ (reader.readString());
       msg.setWardId(value);
       break;
+    case 2:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setCreatedBy(value);
+      break;
+    case 3:
+      var value = /** @type {boolean} */ (reader.readBool());
+      msg.setPrivateOnly(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -4130,9 +2395,9 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.deserializeBinaryFr
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -4140,19 +2405,33 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.prototype.serialize
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest} message
+ * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getWardId();
-  if (f.length > 0) {
+  f = /** @type {string} */ (jspb.Message.getField(message, 1));
+  if (f != null) {
     writer.writeString(
       1,
       f
     );
   }
+  f = /** @type {string} */ (jspb.Message.getField(message, 2));
+  if (f != null) {
+    writer.writeString(
+      2,
+      f
+    );
+  }
+  f = message.getPrivateOnly();
+  if (f) {
+    writer.writeBool(
+      3,
+      f
+    );
+  }
 };
 
 
@@ -4160,17 +2439,89 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.serializeBinaryToWr
  * optional string ward_id = 1;
  * @return {string}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.prototype.getWardId = function() {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.prototype.getWardId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest} returns this
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest} returns this
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.prototype.setWardId = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
+proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.prototype.setWardId = function(value) {
+  return jspb.Message.setField(this, 1, value);
+};
+
+
+/**
+ * Clears the field making it undefined.
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest} returns this
+ */
+proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.prototype.clearWardId = function() {
+  return jspb.Message.setField(this, 1, undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.prototype.hasWardId = function() {
+  return jspb.Message.getField(this, 1) != null;
+};
+
+
+/**
+ * optional string created_by = 2;
+ * @return {string}
+ */
+proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.prototype.getCreatedBy = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest} returns this
+ */
+proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.prototype.setCreatedBy = function(value) {
+  return jspb.Message.setField(this, 2, value);
+};
+
+
+/**
+ * Clears the field making it undefined.
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest} returns this
+ */
+proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.prototype.clearCreatedBy = function() {
+  return jspb.Message.setField(this, 2, undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.prototype.hasCreatedBy = function() {
+  return jspb.Message.getField(this, 2) != null;
+};
+
+
+/**
+ * optional bool private_only = 3;
+ * @return {boolean}
+ */
+proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.prototype.getPrivateOnly = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 3, false));
+};
+
+
+/**
+ * @param {boolean} value
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest} returns this
+ */
+proto.services.tasks_svc.v1.GetAllTaskTemplatesRequest.prototype.setPrivateOnly = function(value) {
+  return jspb.Message.setProto3BooleanField(this, 3, value);
 };
 
 
@@ -4180,7 +2531,7 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest.prototype.setWardId
  * @private {!Array<number>}
  * @const
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.repeatedFields_ = [1];
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.repeatedFields_ = [1];
 
 
 
@@ -4197,8 +2548,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.toObject(opt_includeInstance, this);
 };
 
 
@@ -4207,14 +2558,14 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.prototype.toObject
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.toObject = function(includeInstance, msg) {
   var f, obj = {
     templatesList: jspb.Message.toObjectList(msg.getTemplatesList(),
-    proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.toObject, includeInstance)
+    proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.toObject, includeInstance)
   };
 
   if (includeInstance) {
@@ -4228,23 +2579,23 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.toObject = functio
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse}
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse;
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse;
+  return proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse}
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -4252,8 +2603,8 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.deserializeBinaryF
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = new proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate;
-      reader.readMessage(value,proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.deserializeBinaryFromReader);
+      var value = new proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate;
+      reader.readMessage(value,proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.deserializeBinaryFromReader);
       msg.addTemplates(value);
       break;
     default:
@@ -4269,9 +2620,9 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.deserializeBinaryF
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -4279,18 +2630,18 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.prototype.serializ
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse} message
+ * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getTemplatesList();
   if (f.length > 0) {
     writer.writeRepeatedMessage(
       1,
       f,
-      proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.serializeBinaryToWriter
+      proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.serializeBinaryToWriter
     );
   }
 };
@@ -4302,7 +2653,7 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.serializeBinaryToW
  * @private {!Array<number>}
  * @const
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.repeatedFields_ = [7];
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.repeatedFields_ = [7];
 
 
 
@@ -4319,8 +2670,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.toObject(opt_includeInstance, this);
 };
 
 
@@ -4329,11 +2680,11 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.proto
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.toObject = function(includeInstance, msg) {
   var f, obj = {
     id: jspb.Message.getFieldWithDefault(msg, 1, ""),
     name: jspb.Message.getFieldWithDefault(msg, 2, ""),
@@ -4341,7 +2692,7 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.toObj
     isPublic: jspb.Message.getBooleanFieldWithDefault(msg, 4, false),
     createdBy: jspb.Message.getFieldWithDefault(msg, 6, ""),
     subtasksList: jspb.Message.toObjectList(msg.getSubtasksList(),
-    proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.toObject, includeInstance)
+    proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.toObject, includeInstance)
   };
 
   if (includeInstance) {
@@ -4355,23 +2706,23 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.toObj
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate}
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate;
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate;
+  return proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate}
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -4399,8 +2750,8 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.deser
       msg.setCreatedBy(value);
       break;
     case 7:
-      var value = new proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask;
-      reader.readMessage(value,proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.deserializeBinaryFromReader);
+      var value = new proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask;
+      reader.readMessage(value,proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.deserializeBinaryFromReader);
       msg.addSubtasks(value);
       break;
     default:
@@ -4416,9 +2767,9 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.deser
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -4426,11 +2777,11 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.proto
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate} message
+ * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getId();
   if (f.length > 0) {
@@ -4472,7 +2823,7 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.seria
     writer.writeRepeatedMessage(
       7,
       f,
-      proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.serializeBinaryToWriter
+      proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.serializeBinaryToWriter
     );
   }
 };
@@ -4494,8 +2845,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.prototype.toObject = function(opt_includeInstance) {
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.toObject(opt_includeInstance, this);
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.prototype.toObject = function(opt_includeInstance) {
+  return proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.toObject(opt_includeInstance, this);
 };
 
 
@@ -4504,11 +2855,11 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTa
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask} msg The msg instance to transform.
+ * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.toObject = function(includeInstance, msg) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.toObject = function(includeInstance, msg) {
   var f, obj = {
     id: jspb.Message.getFieldWithDefault(msg, 1, ""),
     taskTemplateId: jspb.Message.getFieldWithDefault(msg, 2, ""),
@@ -4526,23 +2877,23 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTa
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask}
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.deserializeBinary = function(bytes) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask;
-  return proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask;
+  return proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask} msg The message object to deserialize into.
+ * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask}
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.deserializeBinaryFromReader = function(msg, reader) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -4574,9 +2925,9 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTa
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.prototype.serializeBinary = function() {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.serializeBinaryToWriter(this, writer);
+  proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -4584,11 +2935,11 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTa
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask} message
+ * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.serializeBinaryToWriter = function(message, writer) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getId();
   if (f.length > 0) {
@@ -4618,16 +2969,16 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTa
  * optional string id = 1;
  * @return {string}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.prototype.getId = function() {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.prototype.getId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask} returns this
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask} returns this
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.prototype.setId = function(value) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.prototype.setId = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 
@@ -4636,16 +2987,16 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTa
  * optional string task_template_id = 2;
  * @return {string}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.prototype.getTaskTemplateId = function() {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.prototype.getTaskTemplateId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask} returns this
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask} returns this
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.prototype.setTaskTemplateId = function(value) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.prototype.setTaskTemplateId = function(value) {
   return jspb.Message.setProto3StringField(this, 2, value);
 };
 
@@ -4654,16 +3005,16 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTa
  * optional string name = 3;
  * @return {string}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.prototype.getName = function() {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.prototype.getName = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask} returns this
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask} returns this
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask.prototype.setName = function(value) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask.prototype.setName = function(value) {
   return jspb.Message.setProto3StringField(this, 3, value);
 };
 
@@ -4672,16 +3023,16 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTa
  * optional string id = 1;
  * @return {string}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.prototype.getId = function() {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.getId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate} returns this
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} returns this
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.prototype.setId = function(value) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.setId = function(value) {
   return jspb.Message.setProto3StringField(this, 1, value);
 };
 
@@ -4690,16 +3041,16 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.proto
  * optional string name = 2;
  * @return {string}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.prototype.getName = function() {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.getName = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate} returns this
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} returns this
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.prototype.setName = function(value) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.setName = function(value) {
   return jspb.Message.setProto3StringField(this, 2, value);
 };
 
@@ -4708,16 +3059,16 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.proto
  * optional string description = 3;
  * @return {string}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.prototype.getDescription = function() {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.getDescription = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate} returns this
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} returns this
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.prototype.setDescription = function(value) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.setDescription = function(value) {
   return jspb.Message.setProto3StringField(this, 3, value);
 };
 
@@ -4726,16 +3077,16 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.proto
  * optional bool is_public = 4;
  * @return {boolean}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.prototype.getIsPublic = function() {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.getIsPublic = function() {
   return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 4, false));
 };
 
 
 /**
  * @param {boolean} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate} returns this
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} returns this
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.prototype.setIsPublic = function(value) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.setIsPublic = function(value) {
   return jspb.Message.setProto3BooleanField(this, 4, value);
 };
 
@@ -4744,92 +3095,92 @@ proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.proto
  * optional string created_by = 6;
  * @return {string}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.prototype.getCreatedBy = function() {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.getCreatedBy = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate} returns this
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} returns this
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.prototype.setCreatedBy = function(value) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.setCreatedBy = function(value) {
   return jspb.Message.setProto3StringField(this, 6, value);
 };
 
 
 /**
  * repeated SubTask subtasks = 7;
- * @return {!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask>}
+ * @return {!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask>}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.prototype.getSubtasksList = function() {
-  return /** @type{!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask, 7));
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.getSubtasksList = function() {
+  return /** @type{!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask>} */ (
+    jspb.Message.getRepeatedWrapperField(this, proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask, 7));
 };
 
 
 /**
- * @param {!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask>} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate} returns this
+ * @param {!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask>} value
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} returns this
 */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.prototype.setSubtasksList = function(value) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.setSubtasksList = function(value) {
   return jspb.Message.setRepeatedWrapperField(this, 7, value);
 };
 
 
 /**
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask=} opt_value
+ * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask=} opt_value
  * @param {number=} opt_index
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask}
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.prototype.addSubtasks = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 7, opt_value, proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTask, opt_index);
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.addSubtasks = function(opt_value, opt_index) {
+  return jspb.Message.addToRepeatedWrapperField(this, 7, opt_value, proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTask, opt_index);
 };
 
 
 /**
  * Clears the list making it empty but non-null.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate} returns this
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate} returns this
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.prototype.clearSubtasksList = function() {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.prototype.clearSubtasksList = function() {
   return this.setSubtasksList([]);
 };
 
 
 /**
  * repeated TaskTemplate templates = 1;
- * @return {!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate>}
+ * @return {!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate>}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.prototype.getTemplatesList = function() {
-  return /** @type{!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate, 1));
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.prototype.getTemplatesList = function() {
+  return /** @type{!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate>} */ (
+    jspb.Message.getRepeatedWrapperField(this, proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate, 1));
 };
 
 
 /**
- * @param {!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate>} value
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse} returns this
+ * @param {!Array<!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate>} value
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse} returns this
 */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.prototype.setTemplatesList = function(value) {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.prototype.setTemplatesList = function(value) {
   return jspb.Message.setRepeatedWrapperField(this, 1, value);
 };
 
 
 /**
- * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate=} opt_value
+ * @param {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate=} opt_value
  * @param {number=} opt_index
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate}
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate}
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.prototype.addTemplates = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate, opt_index);
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.prototype.addTemplates = function(opt_value, opt_index) {
+  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate, opt_index);
 };
 
 
 /**
  * Clears the list making it empty but non-null.
- * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse} returns this
+ * @return {!proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse} returns this
  */
-proto.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.prototype.clearTemplatesList = function() {
+proto.services.tasks_svc.v1.GetAllTaskTemplatesResponse.prototype.clearTemplatesList = function() {
   return this.setTemplatesList([]);
 };
 
diff --git a/proto/services/tasks_svc/v1/patient_svc.proto b/proto/services/tasks_svc/v1/patient_svc.proto
index 2146c2e06..32b9f40de 100644
--- a/proto/services/tasks_svc/v1/patient_svc.proto
+++ b/proto/services/tasks_svc/v1/patient_svc.proto
@@ -292,6 +292,16 @@ message ReadmitPatientRequest {
 
 message ReadmitPatientResponse {}
 
+//
+// DeletePatient
+//
+
+message DeletePatientRequest {
+  string id = 1;
+}
+
+message DeletePatientResponse {}
+
 //
 // PatientService
 //
@@ -310,4 +320,5 @@ service PatientService {
   rpc UnassignBed(UnassignBedRequest) returns (UnassignBedResponse) {}
   rpc DischargePatient(DischargePatientRequest) returns (DischargePatientResponse) {}
   rpc ReadmitPatient(ReadmitPatientRequest) returns (ReadmitPatientResponse) {}
+  rpc DeletePatient(DeletePatientRequest) returns (DeletePatientResponse) {}
 }
diff --git a/proto/services/tasks_svc/v1/room_svc.proto b/proto/services/tasks_svc/v1/room_svc.proto
index e29ceead9..b54b1e9b4 100644
--- a/proto/services/tasks_svc/v1/room_svc.proto
+++ b/proto/services/tasks_svc/v1/room_svc.proto
@@ -41,33 +41,11 @@ message GetRoomResponse {
 // GetRooms
 //
 
-message GetRoomsRequest {}
-
-message GetRoomsResponse {
-  repeated Room rooms = 1;
-
-  message Room {
-    string id = 1;
-    string name = 2;
-    repeated Bed beds = 3;
-    string ward_id = 5;
-
-    message Bed {
-      string id = 1;
-      string name = 2;
-    }
-  }
-}
-
-//
-// GetRoomsByWard
-//
-
-message GetRoomsByWardRequest {
-  string ward_id = 1; // @gotags: validate:"uuid4"
+message GetRoomsRequest {
+  optional string ward_id = 1; // @gotags: validate:"uuid4"
 }
 
-message GetRoomsByWardResponse {
+message GetRoomsResponse {
   repeated Room rooms = 1;
 
   message Room {
@@ -146,7 +124,6 @@ service RoomService {
   rpc CreateRoom(CreateRoomRequest) returns (CreateRoomResponse) {}
   rpc GetRoom(GetRoomRequest) returns (GetRoomResponse) {}
   rpc GetRooms(GetRoomsRequest) returns (GetRoomsResponse) {}
-  rpc GetRoomsByWard(GetRoomsByWardRequest) returns (GetRoomsByWardResponse) {}
   rpc UpdateRoom(UpdateRoomRequest) returns (UpdateRoomResponse) {}
   rpc DeleteRoom(DeleteRoomRequest) returns (DeleteRoomResponse) {}
   rpc GetRoomOverviewsByWard(GetRoomOverviewsByWardRequest) returns (GetRoomOverviewsByWardResponse) {}
diff --git a/proto/services/tasks_svc/v1/task_svc.proto b/proto/services/tasks_svc/v1/task_svc.proto
index d0e025700..a46a3f6e5 100644
--- a/proto/services/tasks_svc/v1/task_svc.proto
+++ b/proto/services/tasks_svc/v1/task_svc.proto
@@ -19,6 +19,13 @@ message CreateTaskRequest {
   optional bool public = 4;
   google.protobuf.Timestamp due_at = 5;
   optional TaskStatus initial_status = 6;
+  optional string assigned_user_id = 7;
+  repeated SubTask subtasks = 8;
+
+  message SubTask {
+    string name = 1;
+    bool done = 2;
+  }
 }
 
 message CreateTaskResponse {
@@ -35,6 +42,7 @@ message UpdateTaskRequest {
   optional string description = 3;
   optional google.protobuf.Timestamp due_at = 4;
   optional TaskStatus status = 5;
+  optional bool public = 6;
 }
 
 message UpdateTaskResponse {}
@@ -52,14 +60,24 @@ message GetTaskResponse {
   string name = 2;
   string description = 3;
   optional string assigned_user_id = 4;
-  repeated Subtask subtasks = 5;
+  repeated SubTask subtasks = 5;
   TaskStatus status = 6;
   google.protobuf.Timestamp created_at = 7;
+  bool public = 8;
+  google.protobuf.Timestamp due_at = 9;
+  string created_by = 10;
+  Patient patient = 11;
 
-  message Subtask {
+  message Patient {
+    string id = 1;
+    string human_readable_identifier = 2;
+  }
+
+  message SubTask {
     string id = 1;
     string name = 2;
     bool done = 3;
+    string created_by = 4;
   }
 }
 
@@ -155,7 +173,7 @@ message GetAssignedTasksResponse {
 
     message Patient {
       string id = 1;
-      string name = 2;
+      string human_readable_identifier = 2;
     }
 
     message SubTask {
@@ -199,6 +217,7 @@ message CreateSubtaskRequest {
 
   message Subtask {
     string name = 1;
+    bool done = 2;
   }
 }
 
@@ -217,43 +236,43 @@ message UpdateSubtaskRequest {
 
   message Subtask {
     optional string name = 1;
+    optional bool done = 2;
   }
 }
 
 message UpdateSubtaskResponse {}
 
 //
-// CompleteSubtask
+// DeleteSubtask
 //
 
-message CompleteSubtaskRequest {
+message DeleteSubtaskRequest {
   string task_id = 1; // @gotags: validate:"uuid4"
   string subtask_id = 2; // @gotags: validate:"uuid4"
 }
 
-message CompleteSubtaskResponse {}
+message DeleteSubtaskResponse {}
 
 //
-// UncompleteSubtask
+// RemoveTaskDueDate
 //
 
-message UncompleteSubtaskRequest {
-  string task_id = 1; // @gotags: validate:"uuid4"
-  string subtask_id = 2; // @gotags: validate:"uuid4"
+message RemoveTaskDueDateRequest {
+  string task_id = 1;
 }
 
-message UncompleteSubtaskResponse {}
+message RemoveTaskDueDateResponse {}
 
 //
-// DeleteSubtask
+// DeleteTask
 //
 
-message DeleteSubtaskRequest {
-  string task_id = 1; // @gotags: validate:"uuid4"
-  string subtask_id = 2; // @gotags: validate:"uuid4"
+message DeleteTaskRequest {
+  string id = 1;
 }
 
-message DeleteSubtaskResponse {}
+message DeleteTaskResponse {}
+
 
 //
 // TaskService
@@ -270,7 +289,7 @@ service TaskService {
   rpc UnassignTask(UnassignTaskRequest) returns (UnassignTaskResponse) {}
   rpc CreateSubtask(CreateSubtaskRequest) returns (CreateSubtaskResponse) {}
   rpc UpdateSubtask(UpdateSubtaskRequest) returns (UpdateSubtaskResponse) {}
-  rpc CompleteSubtask(CompleteSubtaskRequest) returns (CompleteSubtaskResponse) {}
-  rpc UncompleteSubtask(UncompleteSubtaskRequest) returns (UncompleteSubtaskResponse) {}
   rpc DeleteSubtask(DeleteSubtaskRequest) returns (DeleteSubtaskResponse) {}
+  rpc RemoveTaskDueDate(RemoveTaskDueDateRequest) returns (RemoveTaskDueDateResponse) {}
+  rpc DeleteTask(DeleteTaskRequest) returns (DeleteTaskResponse) {}
 }
diff --git a/proto/services/tasks_svc/v1/task_template_svc.proto b/proto/services/tasks_svc/v1/task_template_svc.proto
index 71812ad50..a353cc89a 100644
--- a/proto/services/tasks_svc/v1/task_template_svc.proto
+++ b/proto/services/tasks_svc/v1/task_template_svc.proto
@@ -23,35 +23,6 @@ message CreateTaskTemplateResponse {
   string id = 1;
 }
 
-
-///
-/// GetAllTaskTemplates
-///
-
-message GetAllTaskTemplatesRequest {
-}
-
-message GetAllTaskTemplatesResponse {
-  repeated TaskTemplate templates = 1;
-
-  message TaskTemplate {
-    string id = 1;
-    string name = 2;
-    string description = 3;
-    bool is_public = 4;
-    string created_by = 6;
-    repeated SubTask subtasks = 7;
-
-    message SubTask {
-      string id = 1;
-      string task_template_id = 2;
-      string name = 3;
-    }
-  }
-}
-
-
-
 ///
 /// DeleteTaskTemplate
 ///
@@ -116,43 +87,18 @@ message CreateTaskTemplateSubTaskResponse {
   string id = 1;
 }
 
-///
-/// GetAllTaskTemplatesByCreator
-///
-
-message GetAllTaskTemplatesByCreatorRequest {
-  string created_by = 1; // @gotags: validate:"required"
-  optional bool private_only = 2;
-}
-
-message GetAllTaskTemplatesByCreatorResponse {
-  repeated TaskTemplate templates = 1;
-
-  message TaskTemplate {
-    string id = 1;
-    string name = 2;
-    string description = 3;
-    bool is_public = 4;
-    repeated SubTask subtasks = 7;
-
-    message SubTask {
-      string id = 1;
-      string task_template_id = 2;
-      string name = 3;
-    }
-  }
-}
-
 
 ///
-/// GetAllTaskTemplatesByWard
+/// GetAllTaskTemplatesByWardAndCreatorFilter
 ///
 
-message GetAllTaskTemplatesByWardRequest {
-  string ward_id = 1;
+message GetAllTaskTemplatesRequest {
+  optional string ward_id = 1; // @gotags: validate:"omitempty,omitnil,uuid4"
+  optional string created_by = 2; // @gotags: validate:"omitempty,omitnil,uuid4"
+  bool private_only = 3;
 }
 
-message GetAllTaskTemplatesByWardResponse {
+message GetAllTaskTemplatesResponse {
   repeated TaskTemplate templates = 1;
 
   message TaskTemplate {
@@ -173,12 +119,10 @@ message GetAllTaskTemplatesByWardResponse {
 
 service TaskTemplateService {
   rpc CreateTaskTemplate (CreateTaskTemplateRequest) returns (CreateTaskTemplateResponse) {}
-  rpc GetAllTaskTemplates (GetAllTaskTemplatesRequest) returns (GetAllTaskTemplatesResponse) {}
   rpc DeleteTaskTemplate (DeleteTaskTemplateRequest) returns (DeleteTaskTemplateResponse) {}
   rpc DeleteTaskTemplateSubTask (DeleteTaskTemplateSubTaskRequest) returns (DeleteTaskTemplateSubTaskResponse) {}
   rpc UpdateTaskTemplate (UpdateTaskTemplateRequest) returns (UpdateTaskTemplateResponse) {}
   rpc UpdateTaskTemplateSubTask (UpdateTaskTemplateSubTaskRequest) returns (UpdateTaskTemplateSubTaskResponse) {}
   rpc CreateTaskTemplateSubTask (CreateTaskTemplateSubTaskRequest) returns (CreateTaskTemplateSubTaskResponse) {}
-  rpc GetAllTaskTemplatesByCreator (GetAllTaskTemplatesByCreatorRequest) returns (GetAllTaskTemplatesByCreatorResponse) {}
-  rpc GetAllTaskTemplatesByWard (GetAllTaskTemplatesByWardRequest) returns (GetAllTaskTemplatesByWardResponse) {}
+  rpc GetAllTaskTemplates (GetAllTaskTemplatesRequest) returns (GetAllTaskTemplatesResponse) {}
 }
diff --git a/proto/services/tasks_svc/v1/types.proto b/proto/services/tasks_svc/v1/types.proto
index e84a646c9..7c33bad4d 100644
--- a/proto/services/tasks_svc/v1/types.proto
+++ b/proto/services/tasks_svc/v1/types.proto
@@ -10,4 +10,3 @@ enum TaskStatus {
   TASK_STATUS_IN_PROGRESS = 2;
   TASK_STATUS_DONE = 3;
 }
-
diff --git a/services/impulse_svc/gen/services/tasks_svc/v1/patient_svc_pb2.py b/services/impulse_svc/gen/services/tasks_svc/v1/patient_svc_pb2.py
index 9267a01d8..ed8543715 100644
--- a/services/impulse_svc/gen/services/tasks_svc/v1/patient_svc_pb2.py
+++ b/services/impulse_svc/gen/services/tasks_svc/v1/patient_svc_pb2.py
@@ -15,7 +15,7 @@
 from services.tasks_svc.v1 import types_pb2 as services_dot_tasks__svc_dot_v1_dot_types__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\'services/tasks_svc/v1/patient_svc.proto\x12\x15services.tasks_svc.v1\x1a!services/tasks_svc/v1/types.proto\"w\n\x14\x43reatePatientRequest\x12:\n\x19human_readable_identifier\x18\x01 \x01(\tR\x17humanReadableIdentifier\x12\x19\n\x05notes\x18\x02 \x01(\tH\x00R\x05notes\x88\x01\x01\x42\x08\n\x06_notes\"\'\n\x15\x43reatePatientResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"#\n\x11GetPatientRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xd7\x03\n\x12GetPatientResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x14\n\x05notes\x18\x03 \x01(\tR\x05notes\x12\x1a\n\x06\x62\x65\x64_id\x18\x04 \x01(\tH\x00R\x05\x62\x65\x64Id\x88\x01\x01\x12\x1c\n\x07ward_id\x18\x05 \x01(\tH\x01R\x06wardId\x88\x01\x01\x12G\n\x04room\x18\x07 \x01(\x0b\x32..services.tasks_svc.v1.GetPatientResponse.RoomH\x02R\x04room\x88\x01\x01\x12\x44\n\x03\x62\x65\x64\x18\x08 \x01(\x0b\x32-.services.tasks_svc.v1.GetPatientResponse.BedH\x03R\x03\x62\x65\x64\x88\x01\x01\x1a\x43\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x03 \x01(\tR\x06wardId\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04nameB\t\n\x07_bed_idB\n\n\x08_ward_idB\x07\n\x05_roomB\x06\n\x04_bed\"/\n\x16GetPatientByBedRequest\x12\x15\n\x06\x62\x65\x64_id\x18\x01 \x01(\tR\x05\x62\x65\x64Id\"\xa2\x01\n\x17GetPatientByBedResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x14\n\x05notes\x18\x03 \x01(\tR\x05notes\x12\x1a\n\x06\x62\x65\x64_id\x18\x04 \x01(\tH\x00R\x05\x62\x65\x64Id\x88\x01\x01\x42\t\n\x07_bed_id\"3\n\x18GetPatientsByWardRequest\x12\x17\n\x07ward_id\x18\x01 \x01(\tR\x06wardId\"\x86\x02\n\x19GetPatientsByWardResponse\x12T\n\x08patients\x18\x01 \x03(\x0b\x32\x38.services.tasks_svc.v1.GetPatientsByWardResponse.PatientR\x08patients\x1a\x92\x01\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x14\n\x05notes\x18\x03 \x01(\tR\x05notes\x12\x1a\n\x06\x62\x65\x64_id\x18\x04 \x01(\tH\x00R\x05\x62\x65\x64Id\x88\x01\x01\x42\t\n\x07_bed_id\"<\n!GetPatientAssignmentByWardRequest\x12\x17\n\x07ward_id\x18\x01 \x01(\tR\x06wardId\"\xd1\x03\n\"GetPatientAssignmentByWardResponse\x12T\n\x05rooms\x18\x01 \x03(\x0b\x32>.services.tasks_svc.v1.GetPatientAssignmentByWardResponse.RoomR\x05rooms\x1a\xd4\x02\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12V\n\x04\x62\x65\x64s\x18\x03 \x03(\x0b\x32\x42.services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.BedR\x04\x62\x65\x64s\x1a\xcf\x01\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12i\n\x07patient\x18\x03 \x01(\x0b\x32J.services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.Bed.PatientH\x00R\x07patient\x88\x01\x01\x1a-\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04nameB\n\n\x08_patient\"*\n\x18GetPatientDetailsRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xb0\x07\n\x19GetPatientDetailsResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x14\n\x05notes\x18\x03 \x01(\tR\x05notes\x12K\n\x05tasks\x18\x04 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetPatientDetailsResponse.TaskR\x05tasks\x12N\n\x04room\x18\x05 \x01(\x0b\x32\x35.services.tasks_svc.v1.GetPatientDetailsResponse.RoomH\x00R\x04room\x88\x01\x01\x12K\n\x03\x62\x65\x64\x18\x06 \x01(\x0b\x32\x34.services.tasks_svc.v1.GetPatientDetailsResponse.BedH\x01R\x03\x62\x65\x64\x88\x01\x01\x12#\n\ris_discharged\x18\x07 \x01(\x08R\x0cisDischarged\x1a\x43\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x03 \x01(\tR\x06wardId\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x1a\xa0\x03\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x39\n\x06status\x18\x04 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12-\n\x10\x61ssigned_user_id\x18\x05 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12\x1d\n\npatient_id\x18\x06 \x01(\tR\tpatientId\x12\x16\n\x06public\x18\x07 \x01(\x08R\x06public\x12Y\n\x08subtasks\x18\x08 \x03(\x0b\x32=.services.tasks_svc.v1.GetPatientDetailsResponse.Task.SubTaskR\x08subtasks\x1a\x41\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64oneB\x13\n\x11_assigned_user_idB\x07\n\x05_roomB\x06\n\x04_bed\"A\n\x15GetPatientListRequest\x12\x1c\n\x07ward_id\x18\x01 \x01(\tH\x00R\x06wardId\x88\x01\x01\x42\n\n\x08_ward_id\"\x8c\t\n\x16GetPatientListResponse\x12M\n\x06\x61\x63tive\x18\x01 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetPatientListResponse.PatientR\x06\x61\x63tive\x12\x66\n\x13unassigned_patients\x18\x02 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetPatientListResponse.PatientR\x12unassignedPatients\x12\x66\n\x13\x64ischarged_patients\x18\x03 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetPatientListResponse.PatientR\x12\x64ischargedPatients\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x1a\x43\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x03 \x01(\tR\x06wardId\x1a\xc2\x02\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x46\n\x04room\x18\x03 \x01(\x0b\x32\x32.services.tasks_svc.v1.GetPatientListResponse.RoomR\x04room\x12\x43\n\x03\x62\x65\x64\x18\x04 \x01(\x0b\x32\x31.services.tasks_svc.v1.GetPatientListResponse.BedR\x03\x62\x65\x64\x12\x14\n\x05notes\x18\x05 \x01(\tR\x05notes\x12H\n\x05tasks\x18\x06 \x03(\x0b\x32\x32.services.tasks_svc.v1.GetPatientListResponse.TaskR\x05tasks\x1a\x9d\x03\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x39\n\x06status\x18\x04 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12-\n\x10\x61ssigned_user_id\x18\x05 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12\x1d\n\npatient_id\x18\x06 \x01(\tR\tpatientId\x12\x16\n\x06public\x18\x07 \x01(\x08R\x06public\x12V\n\x08subtasks\x18\x08 \x03(\x0b\x32:.services.tasks_svc.v1.GetPatientListResponse.Task.SubTaskR\x08subtasks\x1a\x41\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64oneB\x13\n\x11_assigned_user_id\"\x1a\n\x18GetRecentPatientsRequest\"\xf5\x03\n\x19GetRecentPatientsResponse\x12o\n\x0frecent_patients\x18\x01 \x03(\x0b\x32\x46.services.tasks_svc.v1.GetRecentPatientsResponse.PatientWithRoomAndBedR\x0erecentPatients\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x1a\x43\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x03 \x01(\tR\x06wardId\x1a\xf6\x01\n\x15PatientWithRoomAndBed\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12I\n\x04room\x18\x03 \x01(\x0b\x32\x35.services.tasks_svc.v1.GetRecentPatientsResponse.RoomR\x04room\x12\x46\n\x03\x62\x65\x64\x18\x04 \x01(\x0b\x32\x34.services.tasks_svc.v1.GetRecentPatientsResponse.BedR\x03\x62\x65\x64\"\xaa\x01\n\x14UpdatePatientRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12?\n\x19human_readable_identifier\x18\x02 \x01(\tH\x00R\x17humanReadableIdentifier\x88\x01\x01\x12\x19\n\x05notes\x18\x03 \x01(\tH\x01R\x05notes\x88\x01\x01\x42\x1c\n\x1a_human_readable_identifierB\x08\n\x06_notes\"\x17\n\x15UpdatePatientResponse\"9\n\x10\x41ssignBedRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x15\n\x06\x62\x65\x64_id\x18\x02 \x01(\tR\x05\x62\x65\x64Id\"\x13\n\x11\x41ssignBedResponse\"$\n\x12UnassignBedRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x15\n\x13UnassignBedResponse\")\n\x17\x44ischargePatientRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x1a\n\x18\x44ischargePatientResponse\"6\n\x15ReadmitPatientRequest\x12\x1d\n\npatient_id\x18\x01 \x01(\tR\tpatientId\"\x18\n\x16ReadmitPatientResponse2\xec\x0b\n\x0ePatientService\x12l\n\rCreatePatient\x12+.services.tasks_svc.v1.CreatePatientRequest\x1a,.services.tasks_svc.v1.CreatePatientResponse\"\x00\x12\x63\n\nGetPatient\x12(.services.tasks_svc.v1.GetPatientRequest\x1a).services.tasks_svc.v1.GetPatientResponse\"\x00\x12r\n\x0fGetPatientByBed\x12-.services.tasks_svc.v1.GetPatientByBedRequest\x1a..services.tasks_svc.v1.GetPatientByBedResponse\"\x00\x12x\n\x11GetPatientsByWard\x12/.services.tasks_svc.v1.GetPatientsByWardRequest\x1a\x30.services.tasks_svc.v1.GetPatientsByWardResponse\"\x00\x12\x93\x01\n\x1aGetPatientAssignmentByWard\x12\x38.services.tasks_svc.v1.GetPatientAssignmentByWardRequest\x1a\x39.services.tasks_svc.v1.GetPatientAssignmentByWardResponse\"\x00\x12x\n\x11GetPatientDetails\x12/.services.tasks_svc.v1.GetPatientDetailsRequest\x1a\x30.services.tasks_svc.v1.GetPatientDetailsResponse\"\x00\x12o\n\x0eGetPatientList\x12,.services.tasks_svc.v1.GetPatientListRequest\x1a-.services.tasks_svc.v1.GetPatientListResponse\"\x00\x12x\n\x11GetRecentPatients\x12/.services.tasks_svc.v1.GetRecentPatientsRequest\x1a\x30.services.tasks_svc.v1.GetRecentPatientsResponse\"\x00\x12l\n\rUpdatePatient\x12+.services.tasks_svc.v1.UpdatePatientRequest\x1a,.services.tasks_svc.v1.UpdatePatientResponse\"\x00\x12`\n\tAssignBed\x12\'.services.tasks_svc.v1.AssignBedRequest\x1a(.services.tasks_svc.v1.AssignBedResponse\"\x00\x12\x66\n\x0bUnassignBed\x12).services.tasks_svc.v1.UnassignBedRequest\x1a*.services.tasks_svc.v1.UnassignBedResponse\"\x00\x12u\n\x10\x44ischargePatient\x12..services.tasks_svc.v1.DischargePatientRequest\x1a/.services.tasks_svc.v1.DischargePatientResponse\"\x00\x12o\n\x0eReadmitPatient\x12,.services.tasks_svc.v1.ReadmitPatientRequest\x1a-.services.tasks_svc.v1.ReadmitPatientResponse\"\x00\x42\xbc\x01\n\x19\x63om.services.tasks_svc.v1B\x0fPatientSvcProtoP\x01Z\x1cgen/proto/services/tasks-svc\xa2\x02\x03STX\xaa\x02\x14Services.TasksSvc.V1\xca\x02\x14Services\\TasksSvc\\V1\xe2\x02 Services\\TasksSvc\\V1\\GPBMetadata\xea\x02\x16Services::TasksSvc::V1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\'services/tasks_svc/v1/patient_svc.proto\x12\x15services.tasks_svc.v1\x1a!services/tasks_svc/v1/types.proto\"w\n\x14\x43reatePatientRequest\x12:\n\x19human_readable_identifier\x18\x01 \x01(\tR\x17humanReadableIdentifier\x12\x19\n\x05notes\x18\x02 \x01(\tH\x00R\x05notes\x88\x01\x01\x42\x08\n\x06_notes\"\'\n\x15\x43reatePatientResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"#\n\x11GetPatientRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xd7\x03\n\x12GetPatientResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x14\n\x05notes\x18\x03 \x01(\tR\x05notes\x12\x1a\n\x06\x62\x65\x64_id\x18\x04 \x01(\tH\x00R\x05\x62\x65\x64Id\x88\x01\x01\x12\x1c\n\x07ward_id\x18\x05 \x01(\tH\x01R\x06wardId\x88\x01\x01\x12G\n\x04room\x18\x07 \x01(\x0b\x32..services.tasks_svc.v1.GetPatientResponse.RoomH\x02R\x04room\x88\x01\x01\x12\x44\n\x03\x62\x65\x64\x18\x08 \x01(\x0b\x32-.services.tasks_svc.v1.GetPatientResponse.BedH\x03R\x03\x62\x65\x64\x88\x01\x01\x1a\x43\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x03 \x01(\tR\x06wardId\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04nameB\t\n\x07_bed_idB\n\n\x08_ward_idB\x07\n\x05_roomB\x06\n\x04_bed\"/\n\x16GetPatientByBedRequest\x12\x15\n\x06\x62\x65\x64_id\x18\x01 \x01(\tR\x05\x62\x65\x64Id\"\xa2\x01\n\x17GetPatientByBedResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x14\n\x05notes\x18\x03 \x01(\tR\x05notes\x12\x1a\n\x06\x62\x65\x64_id\x18\x04 \x01(\tH\x00R\x05\x62\x65\x64Id\x88\x01\x01\x42\t\n\x07_bed_id\"3\n\x18GetPatientsByWardRequest\x12\x17\n\x07ward_id\x18\x01 \x01(\tR\x06wardId\"\x86\x02\n\x19GetPatientsByWardResponse\x12T\n\x08patients\x18\x01 \x03(\x0b\x32\x38.services.tasks_svc.v1.GetPatientsByWardResponse.PatientR\x08patients\x1a\x92\x01\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x14\n\x05notes\x18\x03 \x01(\tR\x05notes\x12\x1a\n\x06\x62\x65\x64_id\x18\x04 \x01(\tH\x00R\x05\x62\x65\x64Id\x88\x01\x01\x42\t\n\x07_bed_id\"<\n!GetPatientAssignmentByWardRequest\x12\x17\n\x07ward_id\x18\x01 \x01(\tR\x06wardId\"\xd1\x03\n\"GetPatientAssignmentByWardResponse\x12T\n\x05rooms\x18\x01 \x03(\x0b\x32>.services.tasks_svc.v1.GetPatientAssignmentByWardResponse.RoomR\x05rooms\x1a\xd4\x02\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12V\n\x04\x62\x65\x64s\x18\x03 \x03(\x0b\x32\x42.services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.BedR\x04\x62\x65\x64s\x1a\xcf\x01\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12i\n\x07patient\x18\x03 \x01(\x0b\x32J.services.tasks_svc.v1.GetPatientAssignmentByWardResponse.Room.Bed.PatientH\x00R\x07patient\x88\x01\x01\x1a-\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04nameB\n\n\x08_patient\"*\n\x18GetPatientDetailsRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xb0\x07\n\x19GetPatientDetailsResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x14\n\x05notes\x18\x03 \x01(\tR\x05notes\x12K\n\x05tasks\x18\x04 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetPatientDetailsResponse.TaskR\x05tasks\x12N\n\x04room\x18\x05 \x01(\x0b\x32\x35.services.tasks_svc.v1.GetPatientDetailsResponse.RoomH\x00R\x04room\x88\x01\x01\x12K\n\x03\x62\x65\x64\x18\x06 \x01(\x0b\x32\x34.services.tasks_svc.v1.GetPatientDetailsResponse.BedH\x01R\x03\x62\x65\x64\x88\x01\x01\x12#\n\ris_discharged\x18\x07 \x01(\x08R\x0cisDischarged\x1a\x43\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x03 \x01(\tR\x06wardId\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x1a\xa0\x03\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x39\n\x06status\x18\x04 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12-\n\x10\x61ssigned_user_id\x18\x05 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12\x1d\n\npatient_id\x18\x06 \x01(\tR\tpatientId\x12\x16\n\x06public\x18\x07 \x01(\x08R\x06public\x12Y\n\x08subtasks\x18\x08 \x03(\x0b\x32=.services.tasks_svc.v1.GetPatientDetailsResponse.Task.SubTaskR\x08subtasks\x1a\x41\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64oneB\x13\n\x11_assigned_user_idB\x07\n\x05_roomB\x06\n\x04_bed\"A\n\x15GetPatientListRequest\x12\x1c\n\x07ward_id\x18\x01 \x01(\tH\x00R\x06wardId\x88\x01\x01\x42\n\n\x08_ward_id\"\x8c\t\n\x16GetPatientListResponse\x12M\n\x06\x61\x63tive\x18\x01 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetPatientListResponse.PatientR\x06\x61\x63tive\x12\x66\n\x13unassigned_patients\x18\x02 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetPatientListResponse.PatientR\x12unassignedPatients\x12\x66\n\x13\x64ischarged_patients\x18\x03 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetPatientListResponse.PatientR\x12\x64ischargedPatients\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x1a\x43\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x03 \x01(\tR\x06wardId\x1a\xc2\x02\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12\x46\n\x04room\x18\x03 \x01(\x0b\x32\x32.services.tasks_svc.v1.GetPatientListResponse.RoomR\x04room\x12\x43\n\x03\x62\x65\x64\x18\x04 \x01(\x0b\x32\x31.services.tasks_svc.v1.GetPatientListResponse.BedR\x03\x62\x65\x64\x12\x14\n\x05notes\x18\x05 \x01(\tR\x05notes\x12H\n\x05tasks\x18\x06 \x03(\x0b\x32\x32.services.tasks_svc.v1.GetPatientListResponse.TaskR\x05tasks\x1a\x9d\x03\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x39\n\x06status\x18\x04 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12-\n\x10\x61ssigned_user_id\x18\x05 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12\x1d\n\npatient_id\x18\x06 \x01(\tR\tpatientId\x12\x16\n\x06public\x18\x07 \x01(\x08R\x06public\x12V\n\x08subtasks\x18\x08 \x03(\x0b\x32:.services.tasks_svc.v1.GetPatientListResponse.Task.SubTaskR\x08subtasks\x1a\x41\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64oneB\x13\n\x11_assigned_user_id\"\x1a\n\x18GetRecentPatientsRequest\"\xf5\x03\n\x19GetRecentPatientsResponse\x12o\n\x0frecent_patients\x18\x01 \x03(\x0b\x32\x46.services.tasks_svc.v1.GetRecentPatientsResponse.PatientWithRoomAndBedR\x0erecentPatients\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x1a\x43\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x03 \x01(\tR\x06wardId\x1a\xf6\x01\n\x15PatientWithRoomAndBed\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12I\n\x04room\x18\x03 \x01(\x0b\x32\x35.services.tasks_svc.v1.GetRecentPatientsResponse.RoomR\x04room\x12\x46\n\x03\x62\x65\x64\x18\x04 \x01(\x0b\x32\x34.services.tasks_svc.v1.GetRecentPatientsResponse.BedR\x03\x62\x65\x64\"\xaa\x01\n\x14UpdatePatientRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12?\n\x19human_readable_identifier\x18\x02 \x01(\tH\x00R\x17humanReadableIdentifier\x88\x01\x01\x12\x19\n\x05notes\x18\x03 \x01(\tH\x01R\x05notes\x88\x01\x01\x42\x1c\n\x1a_human_readable_identifierB\x08\n\x06_notes\"\x17\n\x15UpdatePatientResponse\"9\n\x10\x41ssignBedRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x15\n\x06\x62\x65\x64_id\x18\x02 \x01(\tR\x05\x62\x65\x64Id\"\x13\n\x11\x41ssignBedResponse\"$\n\x12UnassignBedRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x15\n\x13UnassignBedResponse\")\n\x17\x44ischargePatientRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x1a\n\x18\x44ischargePatientResponse\"6\n\x15ReadmitPatientRequest\x12\x1d\n\npatient_id\x18\x01 \x01(\tR\tpatientId\"\x18\n\x16ReadmitPatientResponse\"&\n\x14\x44\x65letePatientRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x17\n\x15\x44\x65letePatientResponse2\xda\x0c\n\x0ePatientService\x12l\n\rCreatePatient\x12+.services.tasks_svc.v1.CreatePatientRequest\x1a,.services.tasks_svc.v1.CreatePatientResponse\"\x00\x12\x63\n\nGetPatient\x12(.services.tasks_svc.v1.GetPatientRequest\x1a).services.tasks_svc.v1.GetPatientResponse\"\x00\x12r\n\x0fGetPatientByBed\x12-.services.tasks_svc.v1.GetPatientByBedRequest\x1a..services.tasks_svc.v1.GetPatientByBedResponse\"\x00\x12x\n\x11GetPatientsByWard\x12/.services.tasks_svc.v1.GetPatientsByWardRequest\x1a\x30.services.tasks_svc.v1.GetPatientsByWardResponse\"\x00\x12\x93\x01\n\x1aGetPatientAssignmentByWard\x12\x38.services.tasks_svc.v1.GetPatientAssignmentByWardRequest\x1a\x39.services.tasks_svc.v1.GetPatientAssignmentByWardResponse\"\x00\x12x\n\x11GetPatientDetails\x12/.services.tasks_svc.v1.GetPatientDetailsRequest\x1a\x30.services.tasks_svc.v1.GetPatientDetailsResponse\"\x00\x12o\n\x0eGetPatientList\x12,.services.tasks_svc.v1.GetPatientListRequest\x1a-.services.tasks_svc.v1.GetPatientListResponse\"\x00\x12x\n\x11GetRecentPatients\x12/.services.tasks_svc.v1.GetRecentPatientsRequest\x1a\x30.services.tasks_svc.v1.GetRecentPatientsResponse\"\x00\x12l\n\rUpdatePatient\x12+.services.tasks_svc.v1.UpdatePatientRequest\x1a,.services.tasks_svc.v1.UpdatePatientResponse\"\x00\x12`\n\tAssignBed\x12\'.services.tasks_svc.v1.AssignBedRequest\x1a(.services.tasks_svc.v1.AssignBedResponse\"\x00\x12\x66\n\x0bUnassignBed\x12).services.tasks_svc.v1.UnassignBedRequest\x1a*.services.tasks_svc.v1.UnassignBedResponse\"\x00\x12u\n\x10\x44ischargePatient\x12..services.tasks_svc.v1.DischargePatientRequest\x1a/.services.tasks_svc.v1.DischargePatientResponse\"\x00\x12o\n\x0eReadmitPatient\x12,.services.tasks_svc.v1.ReadmitPatientRequest\x1a-.services.tasks_svc.v1.ReadmitPatientResponse\"\x00\x12l\n\rDeletePatient\x12+.services.tasks_svc.v1.DeletePatientRequest\x1a,.services.tasks_svc.v1.DeletePatientResponse\"\x00\x42\xbc\x01\n\x19\x63om.services.tasks_svc.v1B\x0fPatientSvcProtoP\x01Z\x1cgen/proto/services/tasks-svc\xa2\x02\x03STX\xaa\x02\x14Services.TasksSvc.V1\xca\x02\x14Services\\TasksSvc\\V1\xe2\x02 Services\\TasksSvc\\V1\\GPBMetadata\xea\x02\x16Services::TasksSvc::V1b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -111,6 +111,10 @@
   _globals['_READMITPATIENTREQUEST']._serialized_end=5057
   _globals['_READMITPATIENTRESPONSE']._serialized_start=5059
   _globals['_READMITPATIENTRESPONSE']._serialized_end=5083
-  _globals['_PATIENTSERVICE']._serialized_start=5086
-  _globals['_PATIENTSERVICE']._serialized_end=6602
+  _globals['_DELETEPATIENTREQUEST']._serialized_start=5085
+  _globals['_DELETEPATIENTREQUEST']._serialized_end=5123
+  _globals['_DELETEPATIENTRESPONSE']._serialized_start=5125
+  _globals['_DELETEPATIENTRESPONSE']._serialized_end=5148
+  _globals['_PATIENTSERVICE']._serialized_start=5151
+  _globals['_PATIENTSERVICE']._serialized_end=6777
 # @@protoc_insertion_point(module_scope)
diff --git a/services/impulse_svc/gen/services/tasks_svc/v1/patient_svc_pb2_grpc.py b/services/impulse_svc/gen/services/tasks_svc/v1/patient_svc_pb2_grpc.py
index 41a2cd00c..b4c4048c4 100644
--- a/services/impulse_svc/gen/services/tasks_svc/v1/patient_svc_pb2_grpc.py
+++ b/services/impulse_svc/gen/services/tasks_svc/v1/patient_svc_pb2_grpc.py
@@ -83,6 +83,11 @@ def __init__(self, channel):
                 request_serializer=services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.ReadmitPatientRequest.SerializeToString,
                 response_deserializer=services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.ReadmitPatientResponse.FromString,
                 _registered_method=True)
+        self.DeletePatient = channel.unary_unary(
+                '/services.tasks_svc.v1.PatientService/DeletePatient',
+                request_serializer=services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.DeletePatientRequest.SerializeToString,
+                response_deserializer=services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.DeletePatientResponse.FromString,
+                _registered_method=True)
 
 
 class PatientServiceServicer(object):
@@ -170,6 +175,12 @@ def ReadmitPatient(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def DeletePatient(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
 
 def add_PatientServiceServicer_to_server(servicer, server):
     rpc_method_handlers = {
@@ -238,6 +249,11 @@ def add_PatientServiceServicer_to_server(servicer, server):
                     request_deserializer=services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.ReadmitPatientRequest.FromString,
                     response_serializer=services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.ReadmitPatientResponse.SerializeToString,
             ),
+            'DeletePatient': grpc.unary_unary_rpc_method_handler(
+                    servicer.DeletePatient,
+                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.DeletePatientRequest.FromString,
+                    response_serializer=services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.DeletePatientResponse.SerializeToString,
+            ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
             'services.tasks_svc.v1.PatientService', rpc_method_handlers)
@@ -603,3 +619,30 @@ def ReadmitPatient(request,
             timeout,
             metadata,
             _registered_method=True)
+
+    @staticmethod
+    def DeletePatient(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/services.tasks_svc.v1.PatientService/DeletePatient',
+            services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.DeletePatientRequest.SerializeToString,
+            services_dot_tasks__svc_dot_v1_dot_patient__svc__pb2.DeletePatientResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
diff --git a/services/impulse_svc/gen/services/tasks_svc/v1/room_svc_pb2.py b/services/impulse_svc/gen/services/tasks_svc/v1/room_svc_pb2.py
index 6b5b22f90..601b3ef31 100644
--- a/services/impulse_svc/gen/services/tasks_svc/v1/room_svc_pb2.py
+++ b/services/impulse_svc/gen/services/tasks_svc/v1/room_svc_pb2.py
@@ -14,7 +14,7 @@
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$services/tasks_svc/v1/room_svc.proto\x12\x15services.tasks_svc.v1\"@\n\x11\x43reateRoomRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x02 \x01(\tR\x06wardId\"$\n\x12\x43reateRoomResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\" \n\x0eGetRoomRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xb9\x01\n\x0fGetRoomResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12>\n\x04\x62\x65\x64s\x18\x03 \x03(\x0b\x32*.services.tasks_svc.v1.GetRoomResponse.BedR\x04\x62\x65\x64s\x12\x17\n\x07ward_id\x18\x05 \x01(\tR\x06wardId\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\"\x11\n\x0fGetRoomsRequest\"\x8d\x02\n\x10GetRoomsResponse\x12\x42\n\x05rooms\x18\x01 \x03(\x0b\x32,.services.tasks_svc.v1.GetRoomsResponse.RoomR\x05rooms\x1a\xb4\x01\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x44\n\x04\x62\x65\x64s\x18\x03 \x03(\x0b\x32\x30.services.tasks_svc.v1.GetRoomsResponse.Room.BedR\x04\x62\x65\x64s\x12\x17\n\x07ward_id\x18\x05 \x01(\tR\x06wardId\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\"0\n\x15GetRoomsByWardRequest\x12\x17\n\x07ward_id\x18\x01 \x01(\tR\x06wardId\"\x9f\x02\n\x16GetRoomsByWardResponse\x12H\n\x05rooms\x18\x01 \x03(\x0b\x32\x32.services.tasks_svc.v1.GetRoomsByWardResponse.RoomR\x05rooms\x1a\xba\x01\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12J\n\x04\x62\x65\x64s\x18\x03 \x03(\x0b\x32\x36.services.tasks_svc.v1.GetRoomsByWardResponse.Room.BedR\x04\x62\x65\x64s\x12\x17\n\x07ward_id\x18\x05 \x01(\tR\x06wardId\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\"E\n\x11UpdateRoomRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x17\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x88\x01\x01\x42\x07\n\x05_name\"\x14\n\x12UpdateRoomResponse\"#\n\x11\x44\x65leteRoomRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x14\n\x12\x44\x65leteRoomResponse\"/\n\x1dGetRoomOverviewsByWardRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xe2\x04\n\x1eGetRoomOverviewsByWardResponse\x12P\n\x05rooms\x18\x01 \x03(\x0b\x32:.services.tasks_svc.v1.GetRoomOverviewsByWardResponse.RoomR\x05rooms\x1a\xed\x03\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12R\n\x04\x62\x65\x64s\x18\x03 \x03(\x0b\x32>.services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.BedR\x04\x62\x65\x64s\x1a\xec\x02\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\x12\x65\n\x07patient\x18\x02 \x01(\x0b\x32\x46.services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.Bed.PatientH\x00R\x07patient\x88\x01\x01\x1a\xcd\x01\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12+\n\x11tasks_unscheduled\x18\x03 \x01(\rR\x10tasksUnscheduled\x12*\n\x11tasks_in_progress\x18\x04 \x01(\rR\x0ftasksInProgress\x12\x1d\n\ntasks_done\x18\x05 \x01(\rR\ttasksDoneB\n\n\x08_patient2\xf2\x05\n\x0bRoomService\x12\x63\n\nCreateRoom\x12(.services.tasks_svc.v1.CreateRoomRequest\x1a).services.tasks_svc.v1.CreateRoomResponse\"\x00\x12Z\n\x07GetRoom\x12%.services.tasks_svc.v1.GetRoomRequest\x1a&.services.tasks_svc.v1.GetRoomResponse\"\x00\x12]\n\x08GetRooms\x12&.services.tasks_svc.v1.GetRoomsRequest\x1a\'.services.tasks_svc.v1.GetRoomsResponse\"\x00\x12o\n\x0eGetRoomsByWard\x12,.services.tasks_svc.v1.GetRoomsByWardRequest\x1a-.services.tasks_svc.v1.GetRoomsByWardResponse\"\x00\x12\x63\n\nUpdateRoom\x12(.services.tasks_svc.v1.UpdateRoomRequest\x1a).services.tasks_svc.v1.UpdateRoomResponse\"\x00\x12\x63\n\nDeleteRoom\x12(.services.tasks_svc.v1.DeleteRoomRequest\x1a).services.tasks_svc.v1.DeleteRoomResponse\"\x00\x12\x87\x01\n\x16GetRoomOverviewsByWard\x12\x34.services.tasks_svc.v1.GetRoomOverviewsByWardRequest\x1a\x35.services.tasks_svc.v1.GetRoomOverviewsByWardResponse\"\x00\x42\xb9\x01\n\x19\x63om.services.tasks_svc.v1B\x0cRoomSvcProtoP\x01Z\x1cgen/proto/services/tasks-svc\xa2\x02\x03STX\xaa\x02\x14Services.TasksSvc.V1\xca\x02\x14Services\\TasksSvc\\V1\xe2\x02 Services\\TasksSvc\\V1\\GPBMetadata\xea\x02\x16Services::TasksSvc::V1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$services/tasks_svc/v1/room_svc.proto\x12\x15services.tasks_svc.v1\"@\n\x11\x43reateRoomRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x17\n\x07ward_id\x18\x02 \x01(\tR\x06wardId\"$\n\x12\x43reateRoomResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\" \n\x0eGetRoomRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xb9\x01\n\x0fGetRoomResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12>\n\x04\x62\x65\x64s\x18\x03 \x03(\x0b\x32*.services.tasks_svc.v1.GetRoomResponse.BedR\x04\x62\x65\x64s\x12\x17\n\x07ward_id\x18\x05 \x01(\tR\x06wardId\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\";\n\x0fGetRoomsRequest\x12\x1c\n\x07ward_id\x18\x01 \x01(\tH\x00R\x06wardId\x88\x01\x01\x42\n\n\x08_ward_id\"\x8d\x02\n\x10GetRoomsResponse\x12\x42\n\x05rooms\x18\x01 \x03(\x0b\x32,.services.tasks_svc.v1.GetRoomsResponse.RoomR\x05rooms\x1a\xb4\x01\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x44\n\x04\x62\x65\x64s\x18\x03 \x03(\x0b\x32\x30.services.tasks_svc.v1.GetRoomsResponse.Room.BedR\x04\x62\x65\x64s\x12\x17\n\x07ward_id\x18\x05 \x01(\tR\x06wardId\x1a)\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\"E\n\x11UpdateRoomRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x17\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x88\x01\x01\x42\x07\n\x05_name\"\x14\n\x12UpdateRoomResponse\"#\n\x11\x44\x65leteRoomRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x14\n\x12\x44\x65leteRoomResponse\"/\n\x1dGetRoomOverviewsByWardRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xe2\x04\n\x1eGetRoomOverviewsByWardResponse\x12P\n\x05rooms\x18\x01 \x03(\x0b\x32:.services.tasks_svc.v1.GetRoomOverviewsByWardResponse.RoomR\x05rooms\x1a\xed\x03\n\x04Room\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12R\n\x04\x62\x65\x64s\x18\x03 \x03(\x0b\x32>.services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.BedR\x04\x62\x65\x64s\x1a\xec\x02\n\x03\x42\x65\x64\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\x12\x65\n\x07patient\x18\x02 \x01(\x0b\x32\x46.services.tasks_svc.v1.GetRoomOverviewsByWardResponse.Room.Bed.PatientH\x00R\x07patient\x88\x01\x01\x1a\xcd\x01\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x12+\n\x11tasks_unscheduled\x18\x03 \x01(\rR\x10tasksUnscheduled\x12*\n\x11tasks_in_progress\x18\x04 \x01(\rR\x0ftasksInProgress\x12\x1d\n\ntasks_done\x18\x05 \x01(\rR\ttasksDoneB\n\n\x08_patient2\x81\x05\n\x0bRoomService\x12\x63\n\nCreateRoom\x12(.services.tasks_svc.v1.CreateRoomRequest\x1a).services.tasks_svc.v1.CreateRoomResponse\"\x00\x12Z\n\x07GetRoom\x12%.services.tasks_svc.v1.GetRoomRequest\x1a&.services.tasks_svc.v1.GetRoomResponse\"\x00\x12]\n\x08GetRooms\x12&.services.tasks_svc.v1.GetRoomsRequest\x1a\'.services.tasks_svc.v1.GetRoomsResponse\"\x00\x12\x63\n\nUpdateRoom\x12(.services.tasks_svc.v1.UpdateRoomRequest\x1a).services.tasks_svc.v1.UpdateRoomResponse\"\x00\x12\x63\n\nDeleteRoom\x12(.services.tasks_svc.v1.DeleteRoomRequest\x1a).services.tasks_svc.v1.DeleteRoomResponse\"\x00\x12\x87\x01\n\x16GetRoomOverviewsByWard\x12\x34.services.tasks_svc.v1.GetRoomOverviewsByWardRequest\x1a\x35.services.tasks_svc.v1.GetRoomOverviewsByWardResponse\"\x00\x42\xb9\x01\n\x19\x63om.services.tasks_svc.v1B\x0cRoomSvcProtoP\x01Z\x1cgen/proto/services/tasks-svc\xa2\x02\x03STX\xaa\x02\x14Services.TasksSvc.V1\xca\x02\x14Services\\TasksSvc\\V1\xe2\x02 Services\\TasksSvc\\V1\\GPBMetadata\xea\x02\x16Services::TasksSvc::V1b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -33,39 +33,31 @@
   _globals['_GETROOMRESPONSE_BED']._serialized_start=346
   _globals['_GETROOMRESPONSE_BED']._serialized_end=387
   _globals['_GETROOMSREQUEST']._serialized_start=389
-  _globals['_GETROOMSREQUEST']._serialized_end=406
-  _globals['_GETROOMSRESPONSE']._serialized_start=409
-  _globals['_GETROOMSRESPONSE']._serialized_end=678
-  _globals['_GETROOMSRESPONSE_ROOM']._serialized_start=498
-  _globals['_GETROOMSRESPONSE_ROOM']._serialized_end=678
+  _globals['_GETROOMSREQUEST']._serialized_end=448
+  _globals['_GETROOMSRESPONSE']._serialized_start=451
+  _globals['_GETROOMSRESPONSE']._serialized_end=720
+  _globals['_GETROOMSRESPONSE_ROOM']._serialized_start=540
+  _globals['_GETROOMSRESPONSE_ROOM']._serialized_end=720
   _globals['_GETROOMSRESPONSE_ROOM_BED']._serialized_start=346
   _globals['_GETROOMSRESPONSE_ROOM_BED']._serialized_end=387
-  _globals['_GETROOMSBYWARDREQUEST']._serialized_start=680
-  _globals['_GETROOMSBYWARDREQUEST']._serialized_end=728
-  _globals['_GETROOMSBYWARDRESPONSE']._serialized_start=731
-  _globals['_GETROOMSBYWARDRESPONSE']._serialized_end=1018
-  _globals['_GETROOMSBYWARDRESPONSE_ROOM']._serialized_start=832
-  _globals['_GETROOMSBYWARDRESPONSE_ROOM']._serialized_end=1018
-  _globals['_GETROOMSBYWARDRESPONSE_ROOM_BED']._serialized_start=346
-  _globals['_GETROOMSBYWARDRESPONSE_ROOM_BED']._serialized_end=387
-  _globals['_UPDATEROOMREQUEST']._serialized_start=1020
-  _globals['_UPDATEROOMREQUEST']._serialized_end=1089
-  _globals['_UPDATEROOMRESPONSE']._serialized_start=1091
-  _globals['_UPDATEROOMRESPONSE']._serialized_end=1111
-  _globals['_DELETEROOMREQUEST']._serialized_start=1113
-  _globals['_DELETEROOMREQUEST']._serialized_end=1148
-  _globals['_DELETEROOMRESPONSE']._serialized_start=1150
-  _globals['_DELETEROOMRESPONSE']._serialized_end=1170
-  _globals['_GETROOMOVERVIEWSBYWARDREQUEST']._serialized_start=1172
-  _globals['_GETROOMOVERVIEWSBYWARDREQUEST']._serialized_end=1219
-  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE']._serialized_start=1222
-  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE']._serialized_end=1832
-  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM']._serialized_start=1339
-  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM']._serialized_end=1832
-  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM_BED']._serialized_start=1468
-  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM_BED']._serialized_end=1832
-  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM_BED_PATIENT']._serialized_start=1615
-  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM_BED_PATIENT']._serialized_end=1820
-  _globals['_ROOMSERVICE']._serialized_start=1835
-  _globals['_ROOMSERVICE']._serialized_end=2589
+  _globals['_UPDATEROOMREQUEST']._serialized_start=722
+  _globals['_UPDATEROOMREQUEST']._serialized_end=791
+  _globals['_UPDATEROOMRESPONSE']._serialized_start=793
+  _globals['_UPDATEROOMRESPONSE']._serialized_end=813
+  _globals['_DELETEROOMREQUEST']._serialized_start=815
+  _globals['_DELETEROOMREQUEST']._serialized_end=850
+  _globals['_DELETEROOMRESPONSE']._serialized_start=852
+  _globals['_DELETEROOMRESPONSE']._serialized_end=872
+  _globals['_GETROOMOVERVIEWSBYWARDREQUEST']._serialized_start=874
+  _globals['_GETROOMOVERVIEWSBYWARDREQUEST']._serialized_end=921
+  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE']._serialized_start=924
+  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE']._serialized_end=1534
+  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM']._serialized_start=1041
+  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM']._serialized_end=1534
+  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM_BED']._serialized_start=1170
+  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM_BED']._serialized_end=1534
+  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM_BED_PATIENT']._serialized_start=1317
+  _globals['_GETROOMOVERVIEWSBYWARDRESPONSE_ROOM_BED_PATIENT']._serialized_end=1522
+  _globals['_ROOMSERVICE']._serialized_start=1537
+  _globals['_ROOMSERVICE']._serialized_end=2178
 # @@protoc_insertion_point(module_scope)
diff --git a/services/impulse_svc/gen/services/tasks_svc/v1/room_svc_pb2_grpc.py b/services/impulse_svc/gen/services/tasks_svc/v1/room_svc_pb2_grpc.py
index 3f778e082..3f06d59f5 100644
--- a/services/impulse_svc/gen/services/tasks_svc/v1/room_svc_pb2_grpc.py
+++ b/services/impulse_svc/gen/services/tasks_svc/v1/room_svc_pb2_grpc.py
@@ -33,11 +33,6 @@ def __init__(self, channel):
                 request_serializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsRequest.SerializeToString,
                 response_deserializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsResponse.FromString,
                 _registered_method=True)
-        self.GetRoomsByWard = channel.unary_unary(
-                '/services.tasks_svc.v1.RoomService/GetRoomsByWard',
-                request_serializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsByWardRequest.SerializeToString,
-                response_deserializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsByWardResponse.FromString,
-                _registered_method=True)
         self.UpdateRoom = channel.unary_unary(
                 '/services.tasks_svc.v1.RoomService/UpdateRoom',
                 request_serializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.UpdateRoomRequest.SerializeToString,
@@ -80,12 +75,6 @@ def GetRooms(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def GetRoomsByWard(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
     def UpdateRoom(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -122,11 +111,6 @@ def add_RoomServiceServicer_to_server(servicer, server):
                     request_deserializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsRequest.FromString,
                     response_serializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsResponse.SerializeToString,
             ),
-            'GetRoomsByWard': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetRoomsByWard,
-                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsByWardRequest.FromString,
-                    response_serializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsByWardResponse.SerializeToString,
-            ),
             'UpdateRoom': grpc.unary_unary_rpc_method_handler(
                     servicer.UpdateRoom,
                     request_deserializer=services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.UpdateRoomRequest.FromString,
@@ -238,33 +222,6 @@ def GetRooms(request,
             metadata,
             _registered_method=True)
 
-    @staticmethod
-    def GetRoomsByWard(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/services.tasks_svc.v1.RoomService/GetRoomsByWard',
-            services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsByWardRequest.SerializeToString,
-            services_dot_tasks__svc_dot_v1_dot_room__svc__pb2.GetRoomsByWardResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
     @staticmethod
     def UpdateRoom(request,
             target,
diff --git a/services/impulse_svc/gen/services/tasks_svc/v1/task_svc_pb2.py b/services/impulse_svc/gen/services/tasks_svc/v1/task_svc_pb2.py
index e0f7e3d89..8a59e49f7 100644
--- a/services/impulse_svc/gen/services/tasks_svc/v1/task_svc_pb2.py
+++ b/services/impulse_svc/gen/services/tasks_svc/v1/task_svc_pb2.py
@@ -16,7 +16,7 @@
 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$services/tasks_svc/v1/task_svc.proto\x12\x15services.tasks_svc.v1\x1a!services/tasks_svc/v1/types.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xba\x02\n\x11\x43reateTaskRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12%\n\x0b\x64\x65scription\x18\x02 \x01(\tH\x00R\x0b\x64\x65scription\x88\x01\x01\x12\x1d\n\npatient_id\x18\x03 \x01(\tR\tpatientId\x12\x1b\n\x06public\x18\x04 \x01(\x08H\x01R\x06public\x88\x01\x01\x12\x31\n\x06\x64ue_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x05\x64ueAt\x12M\n\x0einitial_status\x18\x06 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusH\x02R\rinitialStatus\x88\x01\x01\x42\x0e\n\x0c_descriptionB\t\n\x07_publicB\x11\n\x0f_initial_status\"$\n\x12\x43reateTaskResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x8a\x02\n\x11UpdateTaskRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x17\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x88\x01\x01\x12%\n\x0b\x64\x65scription\x18\x03 \x01(\tH\x01R\x0b\x64\x65scription\x88\x01\x01\x12\x36\n\x06\x64ue_at\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampH\x02R\x05\x64ueAt\x88\x01\x01\x12>\n\x06status\x18\x05 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusH\x03R\x06status\x88\x01\x01\x42\x07\n\x05_nameB\x0e\n\x0c_descriptionB\t\n\x07_due_atB\t\n\x07_status\"\x14\n\x12UpdateTaskResponse\" \n\x0eGetTaskRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xa0\x03\n\x0fGetTaskResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12-\n\x10\x61ssigned_user_id\x18\x04 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12J\n\x08subtasks\x18\x05 \x03(\x0b\x32..services.tasks_svc.v1.GetTaskResponse.SubtaskR\x08subtasks\x12\x39\n\x06status\x18\x06 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x1a\x41\n\x07Subtask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64oneB\x13\n\x11_assigned_user_id\"9\n\x18GetTasksByPatientRequest\x12\x1d\n\npatient_id\x18\x01 \x01(\tR\tpatientId\"\xb7\x05\n\x19GetTasksByPatientResponse\x12K\n\x05tasks\x18\x01 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetTasksByPatientResponse.TaskR\x05tasks\x1a\xcc\x04\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x39\n\x06status\x18\x04 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12-\n\x10\x61ssigned_user_id\x18\x05 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12\x1d\n\npatient_id\x18\x06 \x01(\tR\tpatientId\x12\x16\n\x06public\x18\x07 \x01(\x08R\x06public\x12\x31\n\x06\x64ue_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x05\x64ueAt\x12\x1d\n\ncreated_by\x18\t \x01(\tR\tcreatedBy\x12Y\n\x08subtasks\x18\n \x03(\x0b\x32=.services.tasks_svc.v1.GetTasksByPatientResponse.Task.SubTaskR\x08subtasks\x12\x39\n\ncreated_at\x18\x0b \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x1a`\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64one\x12\x1d\n\ncreated_by\x18\x04 \x01(\tR\tcreatedByB\x13\n\x11_assigned_user_id\"G\n&GetTasksByPatientSortedByStatusRequest\x12\x1d\n\npatient_id\x18\x01 \x01(\tR\tpatientId\"\xe3\x06\n\'GetTasksByPatientSortedByStatusResponse\x12W\n\x04todo\x18\x01 \x03(\x0b\x32\x43.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.TaskR\x04todo\x12\x64\n\x0bin_progress\x18\x02 \x03(\x0b\x32\x43.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.TaskR\ninProgress\x12W\n\x04\x64one\x18\x03 \x03(\x0b\x32\x43.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.TaskR\x04\x64one\x1a\x9f\x04\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12-\n\x10\x61ssigned_user_id\x18\x04 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12\x1d\n\npatient_id\x18\x05 \x01(\tR\tpatientId\x12\x16\n\x06public\x18\x06 \x01(\x08R\x06public\x12\x31\n\x06\x64ue_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x05\x64ueAt\x12\x1d\n\ncreated_by\x18\x08 \x01(\tR\tcreatedBy\x12g\n\x08subtasks\x18\t \x03(\x0b\x32K.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task.SubTaskR\x08subtasks\x12\x39\n\ncreated_at\x18\n \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x1a`\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64one\x12\x1d\n\ncreated_by\x18\x04 \x01(\tR\tcreatedByB\x13\n\x11_assigned_user_id\"\x19\n\x17GetAssignedTasksRequest\"\x82\x06\n\x18GetAssignedTasksResponse\x12J\n\x05tasks\x18\x01 \x03(\x0b\x32\x34.services.tasks_svc.v1.GetAssignedTasksResponse.TaskR\x05tasks\x1a\x99\x05\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x39\n\x06status\x18\x04 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12(\n\x10\x61ssigned_user_id\x18\x05 \x01(\tR\x0e\x61ssignedUserId\x12V\n\x07patient\x18\x06 \x01(\x0b\x32<.services.tasks_svc.v1.GetAssignedTasksResponse.Task.PatientR\x07patient\x12\x16\n\x06public\x18\x07 \x01(\x08R\x06public\x12\x31\n\x06\x64ue_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x05\x64ueAt\x12\x1d\n\ncreated_by\x18\t \x01(\tR\tcreatedBy\x12X\n\x08subtasks\x18\n \x03(\x0b\x32<.services.tasks_svc.v1.GetAssignedTasksResponse.Task.SubTaskR\x08subtasks\x12\x39\n\ncreated_at\x18\x0b \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x1a-\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x1a`\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64one\x12\x1d\n\ncreated_by\x18\x04 \x01(\tR\tcreatedBy\"E\n\x11\x41ssignTaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x17\n\x07user_id\x18\x02 \x01(\tR\x06userId\"\x14\n\x12\x41ssignTaskResponse\"G\n\x13UnassignTaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x17\n\x07user_id\x18\x02 \x01(\tR\x06userId\"\x16\n\x14UnassignTaskResponse\"\x9d\x01\n\x14\x43reateSubtaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12M\n\x07subtask\x18\x02 \x01(\x0b\x32\x33.services.tasks_svc.v1.CreateSubtaskRequest.SubtaskR\x07subtask\x1a\x1d\n\x07Subtask\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"6\n\x15\x43reateSubtaskResponse\x12\x1d\n\nsubtask_id\x18\x01 \x01(\tR\tsubtaskId\"\xca\x01\n\x14UpdateSubtaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x1d\n\nsubtask_id\x18\x02 \x01(\tR\tsubtaskId\x12M\n\x07subtask\x18\x03 \x01(\x0b\x32\x33.services.tasks_svc.v1.UpdateSubtaskRequest.SubtaskR\x07subtask\x1a+\n\x07Subtask\x12\x17\n\x04name\x18\x01 \x01(\tH\x00R\x04name\x88\x01\x01\x42\x07\n\x05_name\"\x17\n\x15UpdateSubtaskResponse\"P\n\x16\x43ompleteSubtaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x1d\n\nsubtask_id\x18\x02 \x01(\tR\tsubtaskId\"\x19\n\x17\x43ompleteSubtaskResponse\"R\n\x18UncompleteSubtaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x1d\n\nsubtask_id\x18\x02 \x01(\tR\tsubtaskId\"\x1b\n\x19UncompleteSubtaskResponse\"N\n\x14\x44\x65leteSubtaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x1d\n\nsubtask_id\x18\x02 \x01(\tR\tsubtaskId\"\x17\n\x15\x44\x65leteSubtaskResponse2\xd1\x0b\n\x0bTaskService\x12\x63\n\nCreateTask\x12(.services.tasks_svc.v1.CreateTaskRequest\x1a).services.tasks_svc.v1.CreateTaskResponse\"\x00\x12\x63\n\nUpdateTask\x12(.services.tasks_svc.v1.UpdateTaskRequest\x1a).services.tasks_svc.v1.UpdateTaskResponse\"\x00\x12Z\n\x07GetTask\x12%.services.tasks_svc.v1.GetTaskRequest\x1a&.services.tasks_svc.v1.GetTaskResponse\"\x00\x12x\n\x11GetTasksByPatient\x12/.services.tasks_svc.v1.GetTasksByPatientRequest\x1a\x30.services.tasks_svc.v1.GetTasksByPatientResponse\"\x00\x12\xa2\x01\n\x1fGetTasksByPatientSortedByStatus\x12=.services.tasks_svc.v1.GetTasksByPatientSortedByStatusRequest\x1a>.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse\"\x00\x12u\n\x10GetAssignedTasks\x12..services.tasks_svc.v1.GetAssignedTasksRequest\x1a/.services.tasks_svc.v1.GetAssignedTasksResponse\"\x00\x12\x63\n\nAssignTask\x12(.services.tasks_svc.v1.AssignTaskRequest\x1a).services.tasks_svc.v1.AssignTaskResponse\"\x00\x12i\n\x0cUnassignTask\x12*.services.tasks_svc.v1.UnassignTaskRequest\x1a+.services.tasks_svc.v1.UnassignTaskResponse\"\x00\x12l\n\rCreateSubtask\x12+.services.tasks_svc.v1.CreateSubtaskRequest\x1a,.services.tasks_svc.v1.CreateSubtaskResponse\"\x00\x12l\n\rUpdateSubtask\x12+.services.tasks_svc.v1.UpdateSubtaskRequest\x1a,.services.tasks_svc.v1.UpdateSubtaskResponse\"\x00\x12r\n\x0f\x43ompleteSubtask\x12-.services.tasks_svc.v1.CompleteSubtaskRequest\x1a..services.tasks_svc.v1.CompleteSubtaskResponse\"\x00\x12x\n\x11UncompleteSubtask\x12/.services.tasks_svc.v1.UncompleteSubtaskRequest\x1a\x30.services.tasks_svc.v1.UncompleteSubtaskResponse\"\x00\x12l\n\rDeleteSubtask\x12+.services.tasks_svc.v1.DeleteSubtaskRequest\x1a,.services.tasks_svc.v1.DeleteSubtaskResponse\"\x00\x42\xb9\x01\n\x19\x63om.services.tasks_svc.v1B\x0cTaskSvcProtoP\x01Z\x1cgen/proto/services/tasks-svc\xa2\x02\x03STX\xaa\x02\x14Services.TasksSvc.V1\xca\x02\x14Services\\TasksSvc\\V1\xe2\x02 Services\\TasksSvc\\V1\\GPBMetadata\xea\x02\x16Services::TasksSvc::V1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$services/tasks_svc/v1/task_svc.proto\x12\x15services.tasks_svc.v1\x1a!services/tasks_svc/v1/types.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xff\x03\n\x11\x43reateTaskRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12%\n\x0b\x64\x65scription\x18\x02 \x01(\tH\x00R\x0b\x64\x65scription\x88\x01\x01\x12\x1d\n\npatient_id\x18\x03 \x01(\tR\tpatientId\x12\x1b\n\x06public\x18\x04 \x01(\x08H\x01R\x06public\x88\x01\x01\x12\x31\n\x06\x64ue_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x05\x64ueAt\x12M\n\x0einitial_status\x18\x06 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusH\x02R\rinitialStatus\x88\x01\x01\x12-\n\x10\x61ssigned_user_id\x18\x07 \x01(\tH\x03R\x0e\x61ssignedUserId\x88\x01\x01\x12L\n\x08subtasks\x18\x08 \x03(\x0b\x32\x30.services.tasks_svc.v1.CreateTaskRequest.SubTaskR\x08subtasks\x1a\x31\n\x07SubTask\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x02 \x01(\x08R\x04\x64oneB\x0e\n\x0c_descriptionB\t\n\x07_publicB\x11\n\x0f_initial_statusB\x13\n\x11_assigned_user_id\"$\n\x12\x43reateTaskResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xb2\x02\n\x11UpdateTaskRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x17\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x88\x01\x01\x12%\n\x0b\x64\x65scription\x18\x03 \x01(\tH\x01R\x0b\x64\x65scription\x88\x01\x01\x12\x36\n\x06\x64ue_at\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampH\x02R\x05\x64ueAt\x88\x01\x01\x12>\n\x06status\x18\x05 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusH\x03R\x06status\x88\x01\x01\x12\x1b\n\x06public\x18\x06 \x01(\x08H\x04R\x06public\x88\x01\x01\x42\x07\n\x05_nameB\x0e\n\x0c_descriptionB\t\n\x07_due_atB\t\n\x07_statusB\t\n\x07_public\"\x14\n\x12UpdateTaskResponse\" \n\x0eGetTaskRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\xca\x05\n\x0fGetTaskResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12-\n\x10\x61ssigned_user_id\x18\x04 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12J\n\x08subtasks\x18\x05 \x03(\x0b\x32..services.tasks_svc.v1.GetTaskResponse.SubTaskR\x08subtasks\x12\x39\n\x06status\x18\x06 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12\x39\n\ncreated_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x12\x16\n\x06public\x18\x08 \x01(\x08R\x06public\x12\x31\n\x06\x64ue_at\x18\t \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x05\x64ueAt\x12\x1d\n\ncreated_by\x18\n \x01(\tR\tcreatedBy\x12H\n\x07patient\x18\x0b \x01(\x0b\x32..services.tasks_svc.v1.GetTaskResponse.PatientR\x07patient\x1aU\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x1a`\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64one\x12\x1d\n\ncreated_by\x18\x04 \x01(\tR\tcreatedByB\x13\n\x11_assigned_user_id\"9\n\x18GetTasksByPatientRequest\x12\x1d\n\npatient_id\x18\x01 \x01(\tR\tpatientId\"\xb7\x05\n\x19GetTasksByPatientResponse\x12K\n\x05tasks\x18\x01 \x03(\x0b\x32\x35.services.tasks_svc.v1.GetTasksByPatientResponse.TaskR\x05tasks\x1a\xcc\x04\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x39\n\x06status\x18\x04 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12-\n\x10\x61ssigned_user_id\x18\x05 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12\x1d\n\npatient_id\x18\x06 \x01(\tR\tpatientId\x12\x16\n\x06public\x18\x07 \x01(\x08R\x06public\x12\x31\n\x06\x64ue_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x05\x64ueAt\x12\x1d\n\ncreated_by\x18\t \x01(\tR\tcreatedBy\x12Y\n\x08subtasks\x18\n \x03(\x0b\x32=.services.tasks_svc.v1.GetTasksByPatientResponse.Task.SubTaskR\x08subtasks\x12\x39\n\ncreated_at\x18\x0b \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x1a`\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64one\x12\x1d\n\ncreated_by\x18\x04 \x01(\tR\tcreatedByB\x13\n\x11_assigned_user_id\"G\n&GetTasksByPatientSortedByStatusRequest\x12\x1d\n\npatient_id\x18\x01 \x01(\tR\tpatientId\"\xe3\x06\n\'GetTasksByPatientSortedByStatusResponse\x12W\n\x04todo\x18\x01 \x03(\x0b\x32\x43.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.TaskR\x04todo\x12\x64\n\x0bin_progress\x18\x02 \x03(\x0b\x32\x43.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.TaskR\ninProgress\x12W\n\x04\x64one\x18\x03 \x03(\x0b\x32\x43.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.TaskR\x04\x64one\x1a\x9f\x04\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12-\n\x10\x61ssigned_user_id\x18\x04 \x01(\tH\x00R\x0e\x61ssignedUserId\x88\x01\x01\x12\x1d\n\npatient_id\x18\x05 \x01(\tR\tpatientId\x12\x16\n\x06public\x18\x06 \x01(\x08R\x06public\x12\x31\n\x06\x64ue_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x05\x64ueAt\x12\x1d\n\ncreated_by\x18\x08 \x01(\tR\tcreatedBy\x12g\n\x08subtasks\x18\t \x03(\x0b\x32K.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse.Task.SubTaskR\x08subtasks\x12\x39\n\ncreated_at\x18\n \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x1a`\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64one\x12\x1d\n\ncreated_by\x18\x04 \x01(\tR\tcreatedByB\x13\n\x11_assigned_user_id\"\x19\n\x17GetAssignedTasksRequest\"\xaa\x06\n\x18GetAssignedTasksResponse\x12J\n\x05tasks\x18\x01 \x03(\x0b\x32\x34.services.tasks_svc.v1.GetAssignedTasksResponse.TaskR\x05tasks\x1a\xc1\x05\n\x04Task\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x39\n\x06status\x18\x04 \x01(\x0e\x32!.services.tasks_svc.v1.TaskStatusR\x06status\x12(\n\x10\x61ssigned_user_id\x18\x05 \x01(\tR\x0e\x61ssignedUserId\x12V\n\x07patient\x18\x06 \x01(\x0b\x32<.services.tasks_svc.v1.GetAssignedTasksResponse.Task.PatientR\x07patient\x12\x16\n\x06public\x18\x07 \x01(\x08R\x06public\x12\x31\n\x06\x64ue_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x05\x64ueAt\x12\x1d\n\ncreated_by\x18\t \x01(\tR\tcreatedBy\x12X\n\x08subtasks\x18\n \x03(\x0b\x32<.services.tasks_svc.v1.GetAssignedTasksResponse.Task.SubTaskR\x08subtasks\x12\x39\n\ncreated_at\x18\x0b \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tcreatedAt\x1aU\n\x07Patient\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12:\n\x19human_readable_identifier\x18\x02 \x01(\tR\x17humanReadableIdentifier\x1a`\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x03 \x01(\x08R\x04\x64one\x12\x1d\n\ncreated_by\x18\x04 \x01(\tR\tcreatedBy\"E\n\x11\x41ssignTaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x17\n\x07user_id\x18\x02 \x01(\tR\x06userId\"\x14\n\x12\x41ssignTaskResponse\"G\n\x13UnassignTaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x17\n\x07user_id\x18\x02 \x01(\tR\x06userId\"\x16\n\x14UnassignTaskResponse\"\xb1\x01\n\x14\x43reateSubtaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12M\n\x07subtask\x18\x02 \x01(\x0b\x32\x33.services.tasks_svc.v1.CreateSubtaskRequest.SubtaskR\x07subtask\x1a\x31\n\x07Subtask\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x12\n\x04\x64one\x18\x02 \x01(\x08R\x04\x64one\"6\n\x15\x43reateSubtaskResponse\x12\x1d\n\nsubtask_id\x18\x01 \x01(\tR\tsubtaskId\"\xec\x01\n\x14UpdateSubtaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x1d\n\nsubtask_id\x18\x02 \x01(\tR\tsubtaskId\x12M\n\x07subtask\x18\x03 \x01(\x0b\x32\x33.services.tasks_svc.v1.UpdateSubtaskRequest.SubtaskR\x07subtask\x1aM\n\x07Subtask\x12\x17\n\x04name\x18\x01 \x01(\tH\x00R\x04name\x88\x01\x01\x12\x17\n\x04\x64one\x18\x02 \x01(\x08H\x01R\x04\x64one\x88\x01\x01\x42\x07\n\x05_nameB\x07\n\x05_done\"\x17\n\x15UpdateSubtaskResponse\"N\n\x14\x44\x65leteSubtaskRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\x12\x1d\n\nsubtask_id\x18\x02 \x01(\tR\tsubtaskId\"\x17\n\x15\x44\x65leteSubtaskResponse\"3\n\x18RemoveTaskDueDateRequest\x12\x17\n\x07task_id\x18\x01 \x01(\tR\x06taskId\"\x1b\n\x19RemoveTaskDueDateResponse\"#\n\x11\x44\x65leteTaskRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x14\n\x12\x44\x65leteTaskResponse2\xc2\x0b\n\x0bTaskService\x12\x63\n\nCreateTask\x12(.services.tasks_svc.v1.CreateTaskRequest\x1a).services.tasks_svc.v1.CreateTaskResponse\"\x00\x12\x63\n\nUpdateTask\x12(.services.tasks_svc.v1.UpdateTaskRequest\x1a).services.tasks_svc.v1.UpdateTaskResponse\"\x00\x12Z\n\x07GetTask\x12%.services.tasks_svc.v1.GetTaskRequest\x1a&.services.tasks_svc.v1.GetTaskResponse\"\x00\x12x\n\x11GetTasksByPatient\x12/.services.tasks_svc.v1.GetTasksByPatientRequest\x1a\x30.services.tasks_svc.v1.GetTasksByPatientResponse\"\x00\x12\xa2\x01\n\x1fGetTasksByPatientSortedByStatus\x12=.services.tasks_svc.v1.GetTasksByPatientSortedByStatusRequest\x1a>.services.tasks_svc.v1.GetTasksByPatientSortedByStatusResponse\"\x00\x12u\n\x10GetAssignedTasks\x12..services.tasks_svc.v1.GetAssignedTasksRequest\x1a/.services.tasks_svc.v1.GetAssignedTasksResponse\"\x00\x12\x63\n\nAssignTask\x12(.services.tasks_svc.v1.AssignTaskRequest\x1a).services.tasks_svc.v1.AssignTaskResponse\"\x00\x12i\n\x0cUnassignTask\x12*.services.tasks_svc.v1.UnassignTaskRequest\x1a+.services.tasks_svc.v1.UnassignTaskResponse\"\x00\x12l\n\rCreateSubtask\x12+.services.tasks_svc.v1.CreateSubtaskRequest\x1a,.services.tasks_svc.v1.CreateSubtaskResponse\"\x00\x12l\n\rUpdateSubtask\x12+.services.tasks_svc.v1.UpdateSubtaskRequest\x1a,.services.tasks_svc.v1.UpdateSubtaskResponse\"\x00\x12l\n\rDeleteSubtask\x12+.services.tasks_svc.v1.DeleteSubtaskRequest\x1a,.services.tasks_svc.v1.DeleteSubtaskResponse\"\x00\x12x\n\x11RemoveTaskDueDate\x12/.services.tasks_svc.v1.RemoveTaskDueDateRequest\x1a\x30.services.tasks_svc.v1.RemoveTaskDueDateResponse\"\x00\x12\x63\n\nDeleteTask\x12(.services.tasks_svc.v1.DeleteTaskRequest\x1a).services.tasks_svc.v1.DeleteTaskResponse\"\x00\x42\xb9\x01\n\x19\x63om.services.tasks_svc.v1B\x0cTaskSvcProtoP\x01Z\x1cgen/proto/services/tasks-svc\xa2\x02\x03STX\xaa\x02\x14Services.TasksSvc.V1\xca\x02\x14Services\\TasksSvc\\V1\xe2\x02 Services\\TasksSvc\\V1\\GPBMetadata\xea\x02\x16Services::TasksSvc::V1b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -25,77 +25,81 @@
   _globals['DESCRIPTOR']._options = None
   _globals['DESCRIPTOR']._serialized_options = b'\n\031com.services.tasks_svc.v1B\014TaskSvcProtoP\001Z\034gen/proto/services/tasks-svc\242\002\003STX\252\002\024Services.TasksSvc.V1\312\002\024Services\\TasksSvc\\V1\342\002 Services\\TasksSvc\\V1\\GPBMetadata\352\002\026Services::TasksSvc::V1'
   _globals['_CREATETASKREQUEST']._serialized_start=132
-  _globals['_CREATETASKREQUEST']._serialized_end=446
-  _globals['_CREATETASKRESPONSE']._serialized_start=448
-  _globals['_CREATETASKRESPONSE']._serialized_end=484
-  _globals['_UPDATETASKREQUEST']._serialized_start=487
-  _globals['_UPDATETASKREQUEST']._serialized_end=753
-  _globals['_UPDATETASKRESPONSE']._serialized_start=755
-  _globals['_UPDATETASKRESPONSE']._serialized_end=775
-  _globals['_GETTASKREQUEST']._serialized_start=777
-  _globals['_GETTASKREQUEST']._serialized_end=809
-  _globals['_GETTASKRESPONSE']._serialized_start=812
-  _globals['_GETTASKRESPONSE']._serialized_end=1228
-  _globals['_GETTASKRESPONSE_SUBTASK']._serialized_start=1142
-  _globals['_GETTASKRESPONSE_SUBTASK']._serialized_end=1207
-  _globals['_GETTASKSBYPATIENTREQUEST']._serialized_start=1230
-  _globals['_GETTASKSBYPATIENTREQUEST']._serialized_end=1287
-  _globals['_GETTASKSBYPATIENTRESPONSE']._serialized_start=1290
-  _globals['_GETTASKSBYPATIENTRESPONSE']._serialized_end=1985
-  _globals['_GETTASKSBYPATIENTRESPONSE_TASK']._serialized_start=1397
-  _globals['_GETTASKSBYPATIENTRESPONSE_TASK']._serialized_end=1985
-  _globals['_GETTASKSBYPATIENTRESPONSE_TASK_SUBTASK']._serialized_start=1868
-  _globals['_GETTASKSBYPATIENTRESPONSE_TASK_SUBTASK']._serialized_end=1964
-  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSREQUEST']._serialized_start=1987
-  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSREQUEST']._serialized_end=2058
-  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE']._serialized_start=2061
-  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE']._serialized_end=2928
-  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE_TASK']._serialized_start=2385
-  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE_TASK']._serialized_end=2928
-  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE_TASK_SUBTASK']._serialized_start=1868
-  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE_TASK_SUBTASK']._serialized_end=1964
-  _globals['_GETASSIGNEDTASKSREQUEST']._serialized_start=2930
-  _globals['_GETASSIGNEDTASKSREQUEST']._serialized_end=2955
-  _globals['_GETASSIGNEDTASKSRESPONSE']._serialized_start=2958
-  _globals['_GETASSIGNEDTASKSRESPONSE']._serialized_end=3728
-  _globals['_GETASSIGNEDTASKSRESPONSE_TASK']._serialized_start=3063
-  _globals['_GETASSIGNEDTASKSRESPONSE_TASK']._serialized_end=3728
-  _globals['_GETASSIGNEDTASKSRESPONSE_TASK_PATIENT']._serialized_start=3585
-  _globals['_GETASSIGNEDTASKSRESPONSE_TASK_PATIENT']._serialized_end=3630
-  _globals['_GETASSIGNEDTASKSRESPONSE_TASK_SUBTASK']._serialized_start=1868
-  _globals['_GETASSIGNEDTASKSRESPONSE_TASK_SUBTASK']._serialized_end=1964
-  _globals['_ASSIGNTASKREQUEST']._serialized_start=3730
-  _globals['_ASSIGNTASKREQUEST']._serialized_end=3799
-  _globals['_ASSIGNTASKRESPONSE']._serialized_start=3801
-  _globals['_ASSIGNTASKRESPONSE']._serialized_end=3821
-  _globals['_UNASSIGNTASKREQUEST']._serialized_start=3823
-  _globals['_UNASSIGNTASKREQUEST']._serialized_end=3894
-  _globals['_UNASSIGNTASKRESPONSE']._serialized_start=3896
-  _globals['_UNASSIGNTASKRESPONSE']._serialized_end=3918
-  _globals['_CREATESUBTASKREQUEST']._serialized_start=3921
-  _globals['_CREATESUBTASKREQUEST']._serialized_end=4078
-  _globals['_CREATESUBTASKREQUEST_SUBTASK']._serialized_start=4049
-  _globals['_CREATESUBTASKREQUEST_SUBTASK']._serialized_end=4078
-  _globals['_CREATESUBTASKRESPONSE']._serialized_start=4080
-  _globals['_CREATESUBTASKRESPONSE']._serialized_end=4134
-  _globals['_UPDATESUBTASKREQUEST']._serialized_start=4137
-  _globals['_UPDATESUBTASKREQUEST']._serialized_end=4339
-  _globals['_UPDATESUBTASKREQUEST_SUBTASK']._serialized_start=4296
-  _globals['_UPDATESUBTASKREQUEST_SUBTASK']._serialized_end=4339
-  _globals['_UPDATESUBTASKRESPONSE']._serialized_start=4341
-  _globals['_UPDATESUBTASKRESPONSE']._serialized_end=4364
-  _globals['_COMPLETESUBTASKREQUEST']._serialized_start=4366
-  _globals['_COMPLETESUBTASKREQUEST']._serialized_end=4446
-  _globals['_COMPLETESUBTASKRESPONSE']._serialized_start=4448
-  _globals['_COMPLETESUBTASKRESPONSE']._serialized_end=4473
-  _globals['_UNCOMPLETESUBTASKREQUEST']._serialized_start=4475
-  _globals['_UNCOMPLETESUBTASKREQUEST']._serialized_end=4557
-  _globals['_UNCOMPLETESUBTASKRESPONSE']._serialized_start=4559
-  _globals['_UNCOMPLETESUBTASKRESPONSE']._serialized_end=4586
-  _globals['_DELETESUBTASKREQUEST']._serialized_start=4588
-  _globals['_DELETESUBTASKREQUEST']._serialized_end=4666
-  _globals['_DELETESUBTASKRESPONSE']._serialized_start=4668
-  _globals['_DELETESUBTASKRESPONSE']._serialized_end=4691
-  _globals['_TASKSERVICE']._serialized_start=4694
-  _globals['_TASKSERVICE']._serialized_end=6183
+  _globals['_CREATETASKREQUEST']._serialized_end=643
+  _globals['_CREATETASKREQUEST_SUBTASK']._serialized_start=527
+  _globals['_CREATETASKREQUEST_SUBTASK']._serialized_end=576
+  _globals['_CREATETASKRESPONSE']._serialized_start=645
+  _globals['_CREATETASKRESPONSE']._serialized_end=681
+  _globals['_UPDATETASKREQUEST']._serialized_start=684
+  _globals['_UPDATETASKREQUEST']._serialized_end=990
+  _globals['_UPDATETASKRESPONSE']._serialized_start=992
+  _globals['_UPDATETASKRESPONSE']._serialized_end=1012
+  _globals['_GETTASKREQUEST']._serialized_start=1014
+  _globals['_GETTASKREQUEST']._serialized_end=1046
+  _globals['_GETTASKRESPONSE']._serialized_start=1049
+  _globals['_GETTASKRESPONSE']._serialized_end=1763
+  _globals['_GETTASKRESPONSE_PATIENT']._serialized_start=1559
+  _globals['_GETTASKRESPONSE_PATIENT']._serialized_end=1644
+  _globals['_GETTASKRESPONSE_SUBTASK']._serialized_start=1646
+  _globals['_GETTASKRESPONSE_SUBTASK']._serialized_end=1742
+  _globals['_GETTASKSBYPATIENTREQUEST']._serialized_start=1765
+  _globals['_GETTASKSBYPATIENTREQUEST']._serialized_end=1822
+  _globals['_GETTASKSBYPATIENTRESPONSE']._serialized_start=1825
+  _globals['_GETTASKSBYPATIENTRESPONSE']._serialized_end=2520
+  _globals['_GETTASKSBYPATIENTRESPONSE_TASK']._serialized_start=1932
+  _globals['_GETTASKSBYPATIENTRESPONSE_TASK']._serialized_end=2520
+  _globals['_GETTASKSBYPATIENTRESPONSE_TASK_SUBTASK']._serialized_start=1646
+  _globals['_GETTASKSBYPATIENTRESPONSE_TASK_SUBTASK']._serialized_end=1742
+  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSREQUEST']._serialized_start=2522
+  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSREQUEST']._serialized_end=2593
+  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE']._serialized_start=2596
+  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE']._serialized_end=3463
+  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE_TASK']._serialized_start=2920
+  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE_TASK']._serialized_end=3463
+  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE_TASK_SUBTASK']._serialized_start=1646
+  _globals['_GETTASKSBYPATIENTSORTEDBYSTATUSRESPONSE_TASK_SUBTASK']._serialized_end=1742
+  _globals['_GETASSIGNEDTASKSREQUEST']._serialized_start=3465
+  _globals['_GETASSIGNEDTASKSREQUEST']._serialized_end=3490
+  _globals['_GETASSIGNEDTASKSRESPONSE']._serialized_start=3493
+  _globals['_GETASSIGNEDTASKSRESPONSE']._serialized_end=4303
+  _globals['_GETASSIGNEDTASKSRESPONSE_TASK']._serialized_start=3598
+  _globals['_GETASSIGNEDTASKSRESPONSE_TASK']._serialized_end=4303
+  _globals['_GETASSIGNEDTASKSRESPONSE_TASK_PATIENT']._serialized_start=1559
+  _globals['_GETASSIGNEDTASKSRESPONSE_TASK_PATIENT']._serialized_end=1644
+  _globals['_GETASSIGNEDTASKSRESPONSE_TASK_SUBTASK']._serialized_start=1646
+  _globals['_GETASSIGNEDTASKSRESPONSE_TASK_SUBTASK']._serialized_end=1742
+  _globals['_ASSIGNTASKREQUEST']._serialized_start=4305
+  _globals['_ASSIGNTASKREQUEST']._serialized_end=4374
+  _globals['_ASSIGNTASKRESPONSE']._serialized_start=4376
+  _globals['_ASSIGNTASKRESPONSE']._serialized_end=4396
+  _globals['_UNASSIGNTASKREQUEST']._serialized_start=4398
+  _globals['_UNASSIGNTASKREQUEST']._serialized_end=4469
+  _globals['_UNASSIGNTASKRESPONSE']._serialized_start=4471
+  _globals['_UNASSIGNTASKRESPONSE']._serialized_end=4493
+  _globals['_CREATESUBTASKREQUEST']._serialized_start=4496
+  _globals['_CREATESUBTASKREQUEST']._serialized_end=4673
+  _globals['_CREATESUBTASKREQUEST_SUBTASK']._serialized_start=4624
+  _globals['_CREATESUBTASKREQUEST_SUBTASK']._serialized_end=4673
+  _globals['_CREATESUBTASKRESPONSE']._serialized_start=4675
+  _globals['_CREATESUBTASKRESPONSE']._serialized_end=4729
+  _globals['_UPDATESUBTASKREQUEST']._serialized_start=4732
+  _globals['_UPDATESUBTASKREQUEST']._serialized_end=4968
+  _globals['_UPDATESUBTASKREQUEST_SUBTASK']._serialized_start=4891
+  _globals['_UPDATESUBTASKREQUEST_SUBTASK']._serialized_end=4968
+  _globals['_UPDATESUBTASKRESPONSE']._serialized_start=4970
+  _globals['_UPDATESUBTASKRESPONSE']._serialized_end=4993
+  _globals['_DELETESUBTASKREQUEST']._serialized_start=4995
+  _globals['_DELETESUBTASKREQUEST']._serialized_end=5073
+  _globals['_DELETESUBTASKRESPONSE']._serialized_start=5075
+  _globals['_DELETESUBTASKRESPONSE']._serialized_end=5098
+  _globals['_REMOVETASKDUEDATEREQUEST']._serialized_start=5100
+  _globals['_REMOVETASKDUEDATEREQUEST']._serialized_end=5151
+  _globals['_REMOVETASKDUEDATERESPONSE']._serialized_start=5153
+  _globals['_REMOVETASKDUEDATERESPONSE']._serialized_end=5180
+  _globals['_DELETETASKREQUEST']._serialized_start=5182
+  _globals['_DELETETASKREQUEST']._serialized_end=5217
+  _globals['_DELETETASKRESPONSE']._serialized_start=5219
+  _globals['_DELETETASKRESPONSE']._serialized_end=5239
+  _globals['_TASKSERVICE']._serialized_start=5242
+  _globals['_TASKSERVICE']._serialized_end=6716
 # @@protoc_insertion_point(module_scope)
diff --git a/services/impulse_svc/gen/services/tasks_svc/v1/task_svc_pb2_grpc.py b/services/impulse_svc/gen/services/tasks_svc/v1/task_svc_pb2_grpc.py
index e36871cc4..aaf0a0413 100644
--- a/services/impulse_svc/gen/services/tasks_svc/v1/task_svc_pb2_grpc.py
+++ b/services/impulse_svc/gen/services/tasks_svc/v1/task_svc_pb2_grpc.py
@@ -68,21 +68,21 @@ def __init__(self, channel):
                 request_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UpdateSubtaskRequest.SerializeToString,
                 response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UpdateSubtaskResponse.FromString,
                 _registered_method=True)
-        self.CompleteSubtask = channel.unary_unary(
-                '/services.tasks_svc.v1.TaskService/CompleteSubtask',
-                request_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.CompleteSubtaskRequest.SerializeToString,
-                response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.CompleteSubtaskResponse.FromString,
-                _registered_method=True)
-        self.UncompleteSubtask = channel.unary_unary(
-                '/services.tasks_svc.v1.TaskService/UncompleteSubtask',
-                request_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UncompleteSubtaskRequest.SerializeToString,
-                response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UncompleteSubtaskResponse.FromString,
-                _registered_method=True)
         self.DeleteSubtask = channel.unary_unary(
                 '/services.tasks_svc.v1.TaskService/DeleteSubtask',
                 request_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteSubtaskRequest.SerializeToString,
                 response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteSubtaskResponse.FromString,
                 _registered_method=True)
+        self.RemoveTaskDueDate = channel.unary_unary(
+                '/services.tasks_svc.v1.TaskService/RemoveTaskDueDate',
+                request_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.RemoveTaskDueDateRequest.SerializeToString,
+                response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.RemoveTaskDueDateResponse.FromString,
+                _registered_method=True)
+        self.DeleteTask = channel.unary_unary(
+                '/services.tasks_svc.v1.TaskService/DeleteTask',
+                request_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteTaskRequest.SerializeToString,
+                response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteTaskResponse.FromString,
+                _registered_method=True)
 
 
 class TaskServiceServicer(object):
@@ -152,19 +152,19 @@ def UpdateSubtask(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def CompleteSubtask(self, request, context):
+    def DeleteSubtask(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def UncompleteSubtask(self, request, context):
+    def RemoveTaskDueDate(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def DeleteSubtask(self, request, context):
+    def DeleteTask(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
@@ -223,21 +223,21 @@ def add_TaskServiceServicer_to_server(servicer, server):
                     request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UpdateSubtaskRequest.FromString,
                     response_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UpdateSubtaskResponse.SerializeToString,
             ),
-            'CompleteSubtask': grpc.unary_unary_rpc_method_handler(
-                    servicer.CompleteSubtask,
-                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.CompleteSubtaskRequest.FromString,
-                    response_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.CompleteSubtaskResponse.SerializeToString,
-            ),
-            'UncompleteSubtask': grpc.unary_unary_rpc_method_handler(
-                    servicer.UncompleteSubtask,
-                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UncompleteSubtaskRequest.FromString,
-                    response_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UncompleteSubtaskResponse.SerializeToString,
-            ),
             'DeleteSubtask': grpc.unary_unary_rpc_method_handler(
                     servicer.DeleteSubtask,
                     request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteSubtaskRequest.FromString,
                     response_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteSubtaskResponse.SerializeToString,
             ),
+            'RemoveTaskDueDate': grpc.unary_unary_rpc_method_handler(
+                    servicer.RemoveTaskDueDate,
+                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.RemoveTaskDueDateRequest.FromString,
+                    response_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.RemoveTaskDueDateResponse.SerializeToString,
+            ),
+            'DeleteTask': grpc.unary_unary_rpc_method_handler(
+                    servicer.DeleteTask,
+                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteTaskRequest.FromString,
+                    response_serializer=services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteTaskResponse.SerializeToString,
+            ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
             'services.tasks_svc.v1.TaskService', rpc_method_handlers)
@@ -524,7 +524,7 @@ def UpdateSubtask(request,
             _registered_method=True)
 
     @staticmethod
-    def CompleteSubtask(request,
+    def DeleteSubtask(request,
             target,
             options=(),
             channel_credentials=None,
@@ -537,9 +537,9 @@ def CompleteSubtask(request,
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/services.tasks_svc.v1.TaskService/CompleteSubtask',
-            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.CompleteSubtaskRequest.SerializeToString,
-            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.CompleteSubtaskResponse.FromString,
+            '/services.tasks_svc.v1.TaskService/DeleteSubtask',
+            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteSubtaskRequest.SerializeToString,
+            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteSubtaskResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -551,7 +551,7 @@ def CompleteSubtask(request,
             _registered_method=True)
 
     @staticmethod
-    def UncompleteSubtask(request,
+    def RemoveTaskDueDate(request,
             target,
             options=(),
             channel_credentials=None,
@@ -564,9 +564,9 @@ def UncompleteSubtask(request,
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/services.tasks_svc.v1.TaskService/UncompleteSubtask',
-            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UncompleteSubtaskRequest.SerializeToString,
-            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.UncompleteSubtaskResponse.FromString,
+            '/services.tasks_svc.v1.TaskService/RemoveTaskDueDate',
+            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.RemoveTaskDueDateRequest.SerializeToString,
+            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.RemoveTaskDueDateResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -578,7 +578,7 @@ def UncompleteSubtask(request,
             _registered_method=True)
 
     @staticmethod
-    def DeleteSubtask(request,
+    def DeleteTask(request,
             target,
             options=(),
             channel_credentials=None,
@@ -591,9 +591,9 @@ def DeleteSubtask(request,
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/services.tasks_svc.v1.TaskService/DeleteSubtask',
-            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteSubtaskRequest.SerializeToString,
-            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteSubtaskResponse.FromString,
+            '/services.tasks_svc.v1.TaskService/DeleteTask',
+            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteTaskRequest.SerializeToString,
+            services_dot_tasks__svc_dot_v1_dot_task__svc__pb2.DeleteTaskResponse.FromString,
             options,
             channel_credentials,
             insecure,
diff --git a/services/impulse_svc/gen/services/tasks_svc/v1/task_template_svc_pb2.py b/services/impulse_svc/gen/services/tasks_svc/v1/task_template_svc_pb2.py
index 1dfd65413..32de080d9 100644
--- a/services/impulse_svc/gen/services/tasks_svc/v1/task_template_svc_pb2.py
+++ b/services/impulse_svc/gen/services/tasks_svc/v1/task_template_svc_pb2.py
@@ -14,7 +14,7 @@
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n-services/tasks_svc/v1/task_template_svc.proto\x12\x15services.tasks_svc.v1\"\x85\x02\n\x19\x43reateTaskTemplateRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12%\n\x0b\x64\x65scription\x18\x02 \x01(\tH\x00R\x0b\x64\x65scription\x88\x01\x01\x12\x1c\n\x07ward_id\x18\x04 \x01(\tH\x01R\x06wardId\x88\x01\x01\x12T\n\x08subtasks\x18\x05 \x03(\x0b\x32\x38.services.tasks_svc.v1.CreateTaskTemplateRequest.SubTaskR\x08subtasks\x1a\x1d\n\x07SubTask\x12\x12\n\x04name\x18\x01 \x01(\tR\x04nameB\x0e\n\x0c_descriptionB\n\n\x08_ward_id\",\n\x1a\x43reateTaskTemplateResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x1c\n\x1aGetAllTaskTemplatesRequest\"\xcd\x03\n\x1bGetAllTaskTemplatesResponse\x12]\n\ttemplates\x18\x01 \x03(\x0b\x32?.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplateR\ttemplates\x1a\xce\x02\n\x0cTaskTemplate\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x1b\n\tis_public\x18\x04 \x01(\x08R\x08isPublic\x12\x1d\n\ncreated_by\x18\x06 \x01(\tR\tcreatedBy\x12\x63\n\x08subtasks\x18\x07 \x03(\x0b\x32G.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTaskR\x08subtasks\x1aW\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12(\n\x10task_template_id\x18\x02 \x01(\tR\x0etaskTemplateId\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\"+\n\x19\x44\x65leteTaskTemplateRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x1c\n\x1a\x44\x65leteTaskTemplateResponse\"2\n DeleteTaskTemplateSubTaskRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"#\n!DeleteTaskTemplateSubTaskResponse\"\x84\x01\n\x19UpdateTaskTemplateRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x17\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x88\x01\x01\x12%\n\x0b\x64\x65scription\x18\x03 \x01(\tH\x01R\x0b\x64\x65scription\x88\x01\x01\x42\x07\n\x05_nameB\x0e\n\x0c_description\"\x1c\n\x1aUpdateTaskTemplateResponse\"c\n UpdateTaskTemplateSubTaskRequest\x12\x1d\n\nsubtask_id\x18\x01 \x01(\tR\tsubtaskId\x12\x17\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x88\x01\x01\x42\x07\n\x05_name\"#\n!UpdateTaskTemplateSubTaskResponse\"`\n CreateTaskTemplateSubTaskRequest\x12(\n\x10task_template_id\x18\x01 \x01(\tR\x0etaskTemplateId\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\"3\n!CreateTaskTemplateSubTaskResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"}\n#GetAllTaskTemplatesByCreatorRequest\x12\x1d\n\ncreated_by\x18\x01 \x01(\tR\tcreatedBy\x12&\n\x0cprivate_only\x18\x02 \x01(\x08H\x00R\x0bprivateOnly\x88\x01\x01\x42\x0f\n\r_private_only\"\xc9\x03\n$GetAllTaskTemplatesByCreatorResponse\x12\x66\n\ttemplates\x18\x01 \x03(\x0b\x32H.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplateR\ttemplates\x1a\xb8\x02\n\x0cTaskTemplate\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x1b\n\tis_public\x18\x04 \x01(\x08R\x08isPublic\x12l\n\x08subtasks\x18\x07 \x03(\x0b\x32P.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse.TaskTemplate.SubTaskR\x08subtasks\x1aW\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12(\n\x10task_template_id\x18\x02 \x01(\tR\x0etaskTemplateId\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\";\n GetAllTaskTemplatesByWardRequest\x12\x17\n\x07ward_id\x18\x01 \x01(\tR\x06wardId\"\xdf\x03\n!GetAllTaskTemplatesByWardResponse\x12\x63\n\ttemplates\x18\x01 \x03(\x0b\x32\x45.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplateR\ttemplates\x1a\xd4\x02\n\x0cTaskTemplate\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x1b\n\tis_public\x18\x04 \x01(\x08R\x08isPublic\x12\x1d\n\ncreated_by\x18\x06 \x01(\tR\tcreatedBy\x12i\n\x08subtasks\x18\x07 \x03(\x0b\x32M.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse.TaskTemplate.SubTaskR\x08subtasks\x1aW\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12(\n\x10task_template_id\x18\x02 \x01(\tR\x0etaskTemplateId\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name2\xf4\t\n\x13TaskTemplateService\x12{\n\x12\x43reateTaskTemplate\x12\x30.services.tasks_svc.v1.CreateTaskTemplateRequest\x1a\x31.services.tasks_svc.v1.CreateTaskTemplateResponse\"\x00\x12~\n\x13GetAllTaskTemplates\x12\x31.services.tasks_svc.v1.GetAllTaskTemplatesRequest\x1a\x32.services.tasks_svc.v1.GetAllTaskTemplatesResponse\"\x00\x12{\n\x12\x44\x65leteTaskTemplate\x12\x30.services.tasks_svc.v1.DeleteTaskTemplateRequest\x1a\x31.services.tasks_svc.v1.DeleteTaskTemplateResponse\"\x00\x12\x90\x01\n\x19\x44\x65leteTaskTemplateSubTask\x12\x37.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest\x1a\x38.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse\"\x00\x12{\n\x12UpdateTaskTemplate\x12\x30.services.tasks_svc.v1.UpdateTaskTemplateRequest\x1a\x31.services.tasks_svc.v1.UpdateTaskTemplateResponse\"\x00\x12\x90\x01\n\x19UpdateTaskTemplateSubTask\x12\x37.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest\x1a\x38.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse\"\x00\x12\x90\x01\n\x19\x43reateTaskTemplateSubTask\x12\x37.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest\x1a\x38.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse\"\x00\x12\x99\x01\n\x1cGetAllTaskTemplatesByCreator\x12:.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorRequest\x1a;.services.tasks_svc.v1.GetAllTaskTemplatesByCreatorResponse\"\x00\x12\x90\x01\n\x19GetAllTaskTemplatesByWard\x12\x37.services.tasks_svc.v1.GetAllTaskTemplatesByWardRequest\x1a\x38.services.tasks_svc.v1.GetAllTaskTemplatesByWardResponse\"\x00\x42\xc1\x01\n\x19\x63om.services.tasks_svc.v1B\x14TaskTemplateSvcProtoP\x01Z\x1cgen/proto/services/tasks-svc\xa2\x02\x03STX\xaa\x02\x14Services.TasksSvc.V1\xca\x02\x14Services\\TasksSvc\\V1\xe2\x02 Services\\TasksSvc\\V1\\GPBMetadata\xea\x02\x16Services::TasksSvc::V1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n-services/tasks_svc/v1/task_template_svc.proto\x12\x15services.tasks_svc.v1\"\x85\x02\n\x19\x43reateTaskTemplateRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12%\n\x0b\x64\x65scription\x18\x02 \x01(\tH\x00R\x0b\x64\x65scription\x88\x01\x01\x12\x1c\n\x07ward_id\x18\x04 \x01(\tH\x01R\x06wardId\x88\x01\x01\x12T\n\x08subtasks\x18\x05 \x03(\x0b\x32\x38.services.tasks_svc.v1.CreateTaskTemplateRequest.SubTaskR\x08subtasks\x1a\x1d\n\x07SubTask\x12\x12\n\x04name\x18\x01 \x01(\tR\x04nameB\x0e\n\x0c_descriptionB\n\n\x08_ward_id\",\n\x1a\x43reateTaskTemplateResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"+\n\x19\x44\x65leteTaskTemplateRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x1c\n\x1a\x44\x65leteTaskTemplateResponse\"2\n DeleteTaskTemplateSubTaskRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"#\n!DeleteTaskTemplateSubTaskResponse\"\x84\x01\n\x19UpdateTaskTemplateRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x17\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x88\x01\x01\x12%\n\x0b\x64\x65scription\x18\x03 \x01(\tH\x01R\x0b\x64\x65scription\x88\x01\x01\x42\x07\n\x05_nameB\x0e\n\x0c_description\"\x1c\n\x1aUpdateTaskTemplateResponse\"c\n UpdateTaskTemplateSubTaskRequest\x12\x1d\n\nsubtask_id\x18\x01 \x01(\tR\tsubtaskId\x12\x17\n\x04name\x18\x02 \x01(\tH\x00R\x04name\x88\x01\x01\x42\x07\n\x05_name\"#\n!UpdateTaskTemplateSubTaskResponse\"`\n CreateTaskTemplateSubTaskRequest\x12(\n\x10task_template_id\x18\x01 \x01(\tR\x0etaskTemplateId\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\"3\n!CreateTaskTemplateSubTaskResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\"\x9c\x01\n\x1aGetAllTaskTemplatesRequest\x12\x1c\n\x07ward_id\x18\x01 \x01(\tH\x00R\x06wardId\x88\x01\x01\x12\"\n\ncreated_by\x18\x02 \x01(\tH\x01R\tcreatedBy\x88\x01\x01\x12!\n\x0cprivate_only\x18\x03 \x01(\x08R\x0bprivateOnlyB\n\n\x08_ward_idB\r\n\x0b_created_by\"\xcd\x03\n\x1bGetAllTaskTemplatesResponse\x12]\n\ttemplates\x18\x01 \x03(\x0b\x32?.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplateR\ttemplates\x1a\xce\x02\n\x0cTaskTemplate\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x1b\n\tis_public\x18\x04 \x01(\x08R\x08isPublic\x12\x1d\n\ncreated_by\x18\x06 \x01(\tR\tcreatedBy\x12\x63\n\x08subtasks\x18\x07 \x03(\x0b\x32G.services.tasks_svc.v1.GetAllTaskTemplatesResponse.TaskTemplate.SubTaskR\x08subtasks\x1aW\n\x07SubTask\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12(\n\x10task_template_id\x18\x02 \x01(\tR\x0etaskTemplateId\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name2\xc5\x07\n\x13TaskTemplateService\x12{\n\x12\x43reateTaskTemplate\x12\x30.services.tasks_svc.v1.CreateTaskTemplateRequest\x1a\x31.services.tasks_svc.v1.CreateTaskTemplateResponse\"\x00\x12{\n\x12\x44\x65leteTaskTemplate\x12\x30.services.tasks_svc.v1.DeleteTaskTemplateRequest\x1a\x31.services.tasks_svc.v1.DeleteTaskTemplateResponse\"\x00\x12\x90\x01\n\x19\x44\x65leteTaskTemplateSubTask\x12\x37.services.tasks_svc.v1.DeleteTaskTemplateSubTaskRequest\x1a\x38.services.tasks_svc.v1.DeleteTaskTemplateSubTaskResponse\"\x00\x12{\n\x12UpdateTaskTemplate\x12\x30.services.tasks_svc.v1.UpdateTaskTemplateRequest\x1a\x31.services.tasks_svc.v1.UpdateTaskTemplateResponse\"\x00\x12\x90\x01\n\x19UpdateTaskTemplateSubTask\x12\x37.services.tasks_svc.v1.UpdateTaskTemplateSubTaskRequest\x1a\x38.services.tasks_svc.v1.UpdateTaskTemplateSubTaskResponse\"\x00\x12\x90\x01\n\x19\x43reateTaskTemplateSubTask\x12\x37.services.tasks_svc.v1.CreateTaskTemplateSubTaskRequest\x1a\x38.services.tasks_svc.v1.CreateTaskTemplateSubTaskResponse\"\x00\x12~\n\x13GetAllTaskTemplates\x12\x31.services.tasks_svc.v1.GetAllTaskTemplatesRequest\x1a\x32.services.tasks_svc.v1.GetAllTaskTemplatesResponse\"\x00\x42\xc1\x01\n\x19\x63om.services.tasks_svc.v1B\x14TaskTemplateSvcProtoP\x01Z\x1cgen/proto/services/tasks-svc\xa2\x02\x03STX\xaa\x02\x14Services.TasksSvc.V1\xca\x02\x14Services\\TasksSvc\\V1\xe2\x02 Services\\TasksSvc\\V1\\GPBMetadata\xea\x02\x16Services::TasksSvc::V1b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -28,50 +28,34 @@
   _globals['_CREATETASKTEMPLATEREQUEST_SUBTASK']._serialized_end=306
   _globals['_CREATETASKTEMPLATERESPONSE']._serialized_start=336
   _globals['_CREATETASKTEMPLATERESPONSE']._serialized_end=380
-  _globals['_GETALLTASKTEMPLATESREQUEST']._serialized_start=382
-  _globals['_GETALLTASKTEMPLATESREQUEST']._serialized_end=410
-  _globals['_GETALLTASKTEMPLATESRESPONSE']._serialized_start=413
-  _globals['_GETALLTASKTEMPLATESRESPONSE']._serialized_end=874
-  _globals['_GETALLTASKTEMPLATESRESPONSE_TASKTEMPLATE']._serialized_start=540
-  _globals['_GETALLTASKTEMPLATESRESPONSE_TASKTEMPLATE']._serialized_end=874
-  _globals['_GETALLTASKTEMPLATESRESPONSE_TASKTEMPLATE_SUBTASK']._serialized_start=787
-  _globals['_GETALLTASKTEMPLATESRESPONSE_TASKTEMPLATE_SUBTASK']._serialized_end=874
-  _globals['_DELETETASKTEMPLATEREQUEST']._serialized_start=876
-  _globals['_DELETETASKTEMPLATEREQUEST']._serialized_end=919
-  _globals['_DELETETASKTEMPLATERESPONSE']._serialized_start=921
-  _globals['_DELETETASKTEMPLATERESPONSE']._serialized_end=949
-  _globals['_DELETETASKTEMPLATESUBTASKREQUEST']._serialized_start=951
-  _globals['_DELETETASKTEMPLATESUBTASKREQUEST']._serialized_end=1001
-  _globals['_DELETETASKTEMPLATESUBTASKRESPONSE']._serialized_start=1003
-  _globals['_DELETETASKTEMPLATESUBTASKRESPONSE']._serialized_end=1038
-  _globals['_UPDATETASKTEMPLATEREQUEST']._serialized_start=1041
-  _globals['_UPDATETASKTEMPLATEREQUEST']._serialized_end=1173
-  _globals['_UPDATETASKTEMPLATERESPONSE']._serialized_start=1175
-  _globals['_UPDATETASKTEMPLATERESPONSE']._serialized_end=1203
-  _globals['_UPDATETASKTEMPLATESUBTASKREQUEST']._serialized_start=1205
-  _globals['_UPDATETASKTEMPLATESUBTASKREQUEST']._serialized_end=1304
-  _globals['_UPDATETASKTEMPLATESUBTASKRESPONSE']._serialized_start=1306
-  _globals['_UPDATETASKTEMPLATESUBTASKRESPONSE']._serialized_end=1341
-  _globals['_CREATETASKTEMPLATESUBTASKREQUEST']._serialized_start=1343
-  _globals['_CREATETASKTEMPLATESUBTASKREQUEST']._serialized_end=1439
-  _globals['_CREATETASKTEMPLATESUBTASKRESPONSE']._serialized_start=1441
-  _globals['_CREATETASKTEMPLATESUBTASKRESPONSE']._serialized_end=1492
-  _globals['_GETALLTASKTEMPLATESBYCREATORREQUEST']._serialized_start=1494
-  _globals['_GETALLTASKTEMPLATESBYCREATORREQUEST']._serialized_end=1619
-  _globals['_GETALLTASKTEMPLATESBYCREATORRESPONSE']._serialized_start=1622
-  _globals['_GETALLTASKTEMPLATESBYCREATORRESPONSE']._serialized_end=2079
-  _globals['_GETALLTASKTEMPLATESBYCREATORRESPONSE_TASKTEMPLATE']._serialized_start=1767
-  _globals['_GETALLTASKTEMPLATESBYCREATORRESPONSE_TASKTEMPLATE']._serialized_end=2079
-  _globals['_GETALLTASKTEMPLATESBYCREATORRESPONSE_TASKTEMPLATE_SUBTASK']._serialized_start=787
-  _globals['_GETALLTASKTEMPLATESBYCREATORRESPONSE_TASKTEMPLATE_SUBTASK']._serialized_end=874
-  _globals['_GETALLTASKTEMPLATESBYWARDREQUEST']._serialized_start=2081
-  _globals['_GETALLTASKTEMPLATESBYWARDREQUEST']._serialized_end=2140
-  _globals['_GETALLTASKTEMPLATESBYWARDRESPONSE']._serialized_start=2143
-  _globals['_GETALLTASKTEMPLATESBYWARDRESPONSE']._serialized_end=2622
-  _globals['_GETALLTASKTEMPLATESBYWARDRESPONSE_TASKTEMPLATE']._serialized_start=2282
-  _globals['_GETALLTASKTEMPLATESBYWARDRESPONSE_TASKTEMPLATE']._serialized_end=2622
-  _globals['_GETALLTASKTEMPLATESBYWARDRESPONSE_TASKTEMPLATE_SUBTASK']._serialized_start=787
-  _globals['_GETALLTASKTEMPLATESBYWARDRESPONSE_TASKTEMPLATE_SUBTASK']._serialized_end=874
-  _globals['_TASKTEMPLATESERVICE']._serialized_start=2625
-  _globals['_TASKTEMPLATESERVICE']._serialized_end=3893
+  _globals['_DELETETASKTEMPLATEREQUEST']._serialized_start=382
+  _globals['_DELETETASKTEMPLATEREQUEST']._serialized_end=425
+  _globals['_DELETETASKTEMPLATERESPONSE']._serialized_start=427
+  _globals['_DELETETASKTEMPLATERESPONSE']._serialized_end=455
+  _globals['_DELETETASKTEMPLATESUBTASKREQUEST']._serialized_start=457
+  _globals['_DELETETASKTEMPLATESUBTASKREQUEST']._serialized_end=507
+  _globals['_DELETETASKTEMPLATESUBTASKRESPONSE']._serialized_start=509
+  _globals['_DELETETASKTEMPLATESUBTASKRESPONSE']._serialized_end=544
+  _globals['_UPDATETASKTEMPLATEREQUEST']._serialized_start=547
+  _globals['_UPDATETASKTEMPLATEREQUEST']._serialized_end=679
+  _globals['_UPDATETASKTEMPLATERESPONSE']._serialized_start=681
+  _globals['_UPDATETASKTEMPLATERESPONSE']._serialized_end=709
+  _globals['_UPDATETASKTEMPLATESUBTASKREQUEST']._serialized_start=711
+  _globals['_UPDATETASKTEMPLATESUBTASKREQUEST']._serialized_end=810
+  _globals['_UPDATETASKTEMPLATESUBTASKRESPONSE']._serialized_start=812
+  _globals['_UPDATETASKTEMPLATESUBTASKRESPONSE']._serialized_end=847
+  _globals['_CREATETASKTEMPLATESUBTASKREQUEST']._serialized_start=849
+  _globals['_CREATETASKTEMPLATESUBTASKREQUEST']._serialized_end=945
+  _globals['_CREATETASKTEMPLATESUBTASKRESPONSE']._serialized_start=947
+  _globals['_CREATETASKTEMPLATESUBTASKRESPONSE']._serialized_end=998
+  _globals['_GETALLTASKTEMPLATESREQUEST']._serialized_start=1001
+  _globals['_GETALLTASKTEMPLATESREQUEST']._serialized_end=1157
+  _globals['_GETALLTASKTEMPLATESRESPONSE']._serialized_start=1160
+  _globals['_GETALLTASKTEMPLATESRESPONSE']._serialized_end=1621
+  _globals['_GETALLTASKTEMPLATESRESPONSE_TASKTEMPLATE']._serialized_start=1287
+  _globals['_GETALLTASKTEMPLATESRESPONSE_TASKTEMPLATE']._serialized_end=1621
+  _globals['_GETALLTASKTEMPLATESRESPONSE_TASKTEMPLATE_SUBTASK']._serialized_start=1534
+  _globals['_GETALLTASKTEMPLATESRESPONSE_TASKTEMPLATE_SUBTASK']._serialized_end=1621
+  _globals['_TASKTEMPLATESERVICE']._serialized_start=1624
+  _globals['_TASKTEMPLATESERVICE']._serialized_end=2589
 # @@protoc_insertion_point(module_scope)
diff --git a/services/impulse_svc/gen/services/tasks_svc/v1/task_template_svc_pb2_grpc.py b/services/impulse_svc/gen/services/tasks_svc/v1/task_template_svc_pb2_grpc.py
index cd4d6ab80..0f531c3c5 100644
--- a/services/impulse_svc/gen/services/tasks_svc/v1/task_template_svc_pb2_grpc.py
+++ b/services/impulse_svc/gen/services/tasks_svc/v1/task_template_svc_pb2_grpc.py
@@ -19,11 +19,6 @@ def __init__(self, channel):
                 request_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.CreateTaskTemplateRequest.SerializeToString,
                 response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.CreateTaskTemplateResponse.FromString,
                 _registered_method=True)
-        self.GetAllTaskTemplates = channel.unary_unary(
-                '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplates',
-                request_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesRequest.SerializeToString,
-                response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesResponse.FromString,
-                _registered_method=True)
         self.DeleteTaskTemplate = channel.unary_unary(
                 '/services.tasks_svc.v1.TaskTemplateService/DeleteTaskTemplate',
                 request_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.DeleteTaskTemplateRequest.SerializeToString,
@@ -49,15 +44,10 @@ def __init__(self, channel):
                 request_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.CreateTaskTemplateSubTaskRequest.SerializeToString,
                 response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.CreateTaskTemplateSubTaskResponse.FromString,
                 _registered_method=True)
-        self.GetAllTaskTemplatesByCreator = channel.unary_unary(
-                '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplatesByCreator',
-                request_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByCreatorRequest.SerializeToString,
-                response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByCreatorResponse.FromString,
-                _registered_method=True)
-        self.GetAllTaskTemplatesByWard = channel.unary_unary(
-                '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplatesByWard',
-                request_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByWardRequest.SerializeToString,
-                response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByWardResponse.FromString,
+        self.GetAllTaskTemplates = channel.unary_unary(
+                '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplates',
+                request_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesRequest.SerializeToString,
+                response_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesResponse.FromString,
                 _registered_method=True)
 
 
@@ -70,12 +60,6 @@ def CreateTaskTemplate(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def GetAllTaskTemplates(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
     def DeleteTaskTemplate(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -106,13 +90,7 @@ def CreateTaskTemplateSubTask(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def GetAllTaskTemplatesByCreator(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def GetAllTaskTemplatesByWard(self, request, context):
+    def GetAllTaskTemplates(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
@@ -126,11 +104,6 @@ def add_TaskTemplateServiceServicer_to_server(servicer, server):
                     request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.CreateTaskTemplateRequest.FromString,
                     response_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.CreateTaskTemplateResponse.SerializeToString,
             ),
-            'GetAllTaskTemplates': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetAllTaskTemplates,
-                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesRequest.FromString,
-                    response_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesResponse.SerializeToString,
-            ),
             'DeleteTaskTemplate': grpc.unary_unary_rpc_method_handler(
                     servicer.DeleteTaskTemplate,
                     request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.DeleteTaskTemplateRequest.FromString,
@@ -156,15 +129,10 @@ def add_TaskTemplateServiceServicer_to_server(servicer, server):
                     request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.CreateTaskTemplateSubTaskRequest.FromString,
                     response_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.CreateTaskTemplateSubTaskResponse.SerializeToString,
             ),
-            'GetAllTaskTemplatesByCreator': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetAllTaskTemplatesByCreator,
-                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByCreatorRequest.FromString,
-                    response_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByCreatorResponse.SerializeToString,
-            ),
-            'GetAllTaskTemplatesByWard': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetAllTaskTemplatesByWard,
-                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByWardRequest.FromString,
-                    response_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByWardResponse.SerializeToString,
+            'GetAllTaskTemplates': grpc.unary_unary_rpc_method_handler(
+                    servicer.GetAllTaskTemplates,
+                    request_deserializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesRequest.FromString,
+                    response_serializer=services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesResponse.SerializeToString,
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
@@ -204,33 +172,6 @@ def CreateTaskTemplate(request,
             metadata,
             _registered_method=True)
 
-    @staticmethod
-    def GetAllTaskTemplates(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplates',
-            services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesRequest.SerializeToString,
-            services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
     @staticmethod
     def DeleteTaskTemplate(request,
             target,
@@ -367,34 +308,7 @@ def CreateTaskTemplateSubTask(request,
             _registered_method=True)
 
     @staticmethod
-    def GetAllTaskTemplatesByCreator(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplatesByCreator',
-            services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByCreatorRequest.SerializeToString,
-            services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByCreatorResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def GetAllTaskTemplatesByWard(request,
+    def GetAllTaskTemplates(request,
             target,
             options=(),
             channel_credentials=None,
@@ -407,9 +321,9 @@ def GetAllTaskTemplatesByWard(request,
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplatesByWard',
-            services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByWardRequest.SerializeToString,
-            services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesByWardResponse.FromString,
+            '/services.tasks_svc.v1.TaskTemplateService/GetAllTaskTemplates',
+            services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesRequest.SerializeToString,
+            services_dot_tasks__svc_dot_v1_dot_task__template__svc__pb2.GetAllTaskTemplatesResponse.FromString,
             options,
             channel_credentials,
             insecure,
diff --git a/services/tasks-svc/internal/patient/api/grpc.go b/services/tasks-svc/internal/patient/api/grpc.go
index 397e39d11..19af6a8e0 100644
--- a/services/tasks-svc/internal/patient/api/grpc.go
+++ b/services/tasks-svc/internal/patient/api/grpc.go
@@ -460,3 +460,6 @@ func (s *PatientGrpcService) ReadmitPatient(ctx context.Context, req *pb.Readmit
 
 	return &pb.ReadmitPatientResponse{}, nil
 }
+
+// TODO: GetPatientAssignmentByWard
+// TODO: DeletePatientEndpoint
diff --git a/services/tasks-svc/internal/room/room.go b/services/tasks-svc/internal/room/room.go
index d7888f00f..35c696105 100644
--- a/services/tasks-svc/internal/room/room.go
+++ b/services/tasks-svc/internal/room/room.go
@@ -118,6 +118,7 @@ func (ServiceServer) GetRooms(ctx context.Context, _ *pb.GetRoomsRequest) (*pb.G
 	roomRepo := room_repo.New(hwdb.GetDB())
 
 	// TODO: Auth
+	// TODO: implement filtering by ward_id contained in req
 
 	rows, err := roomRepo.GetRoomsWithBeds(ctx, uuid.NullUUID{UUID: uuid.Nil, Valid: false})
 	err = hwdb.Error(ctx, err)
@@ -157,54 +158,6 @@ func (ServiceServer) GetRooms(ctx context.Context, _ *pb.GetRoomsRequest) (*pb.G
 	}, nil
 }
 
-func (ServiceServer) GetRoomsByWard(ctx context.Context, req *pb.GetRoomsByWardRequest) (*pb.GetRoomsByWardResponse, error) {
-	roomRepo := room_repo.New(hwdb.GetDB())
-
-	// TODO: Auth
-
-	wardId, err := uuid.Parse(req.WardId)
-	if err != nil {
-		return nil, status.Error(codes.InvalidArgument, err.Error())
-	}
-
-	rows, err := roomRepo.GetRoomsWithBeds(ctx, uuid.NullUUID{UUID: wardId, Valid: true})
-	err = hwdb.Error(ctx, err)
-	if err != nil {
-		return nil, err
-	}
-
-	processedRooms := make(map[uuid.UUID]bool)
-
-	roomsResponse := hwutil.FlatMap(rows, func(roomRow room_repo.GetRoomsWithBedsRow) **pb.GetRoomsByWardResponse_Room {
-		room := roomRow.Room
-		if _, processed := processedRooms[room.ID]; processed {
-			return nil
-		}
-		processedRooms[room.ID] = true
-		beds := hwutil.FlatMap(rows, func(bedRow room_repo.GetRoomsWithBedsRow) **pb.GetRoomsByWardResponse_Room_Bed {
-			if !bedRow.BedID.Valid || bedRow.Room.ID != room.ID {
-				return nil
-			}
-			val := &pb.GetRoomsByWardResponse_Room_Bed{
-				Id:   bedRow.BedID.UUID.String(),
-				Name: *bedRow.BedName,
-			}
-			return &val
-		})
-		val := &pb.GetRoomsByWardResponse_Room{
-			Id:     room.ID.String(),
-			Name:   room.Name,
-			Beds:   beds,
-			WardId: room.WardID.String(),
-		}
-		return &val
-	})
-
-	return &pb.GetRoomsByWardResponse{
-		Rooms: roomsResponse,
-	}, nil
-}
-
 func (ServiceServer) DeleteRoom(ctx context.Context, req *pb.DeleteRoomRequest) (*pb.DeleteRoomResponse, error) {
 	roomRepo := room_repo.New(hwdb.GetDB())
 
diff --git a/services/tasks-svc/internal/task-template/task_template.go b/services/tasks-svc/internal/task-template/task_template.go
index 0b5429a4a..3991e0863 100644
--- a/services/tasks-svc/internal/task-template/task_template.go
+++ b/services/tasks-svc/internal/task-template/task_template.go
@@ -89,50 +89,6 @@ func (ServiceServer) CreateTaskTemplate(ctx context.Context, req *pb.CreateTaskT
 	}, nil
 }
 
-func (ServiceServer) GetAllTaskTemplates(ctx context.Context, _ *pb.GetAllTaskTemplatesRequest) (*pb.GetAllTaskTemplatesResponse, error) {
-	templateRepo := task_template_repo.New(hwdb.GetDB())
-
-	rows, err := templateRepo.GetAllTaskTemplatesWithSubTasks(ctx, task_template_repo.GetAllTaskTemplatesWithSubTasksParams{})
-
-	err = hwdb.Error(ctx, err)
-	if err != nil {
-		return nil, err
-	}
-
-	templates := make([]*pb.GetAllTaskTemplatesResponse_TaskTemplate, 0)
-	templateMap := make(map[uuid.UUID]int)
-
-	for _, row := range rows {
-		var template *pb.GetAllTaskTemplatesResponse_TaskTemplate
-		if ix, found := templateMap[row.TaskTemplate.ID]; found {
-			template = templates[ix]
-		} else {
-			template = &pb.GetAllTaskTemplatesResponse_TaskTemplate{
-				Id:          row.TaskTemplate.ID.String(),
-				Name:        row.TaskTemplate.Name,
-				Description: row.TaskTemplate.Description,
-				IsPublic:    row.TaskTemplate.WardID.Valid,
-				CreatedBy:   row.TaskTemplate.CreatedBy.String(),
-				Subtasks:    make([]*pb.GetAllTaskTemplatesResponse_TaskTemplate_SubTask, 0),
-			}
-			templates = append(templates, template)
-			templateMap[row.TaskTemplate.ID] = len(templates) - 1
-		}
-
-		if row.SubTaskName != nil {
-			template.Subtasks = append(template.Subtasks, &pb.GetAllTaskTemplatesResponse_TaskTemplate_SubTask{
-				Name:           *row.SubTaskName,
-				TaskTemplateId: row.TaskTemplate.ID.String(),
-				Id:             row.SubTaskID.UUID.String(), // must exist by constraint
-			})
-		}
-	}
-
-	return &pb.GetAllTaskTemplatesResponse{
-		Templates: templates,
-	}, nil
-}
-
 func (ServiceServer) DeleteTaskTemplate(ctx context.Context, req *pb.DeleteTaskTemplateRequest) (*pb.DeleteTaskTemplateResponse, error) {
 	log := zlog.Ctx(ctx)
 	templateRepo := task_template_repo.New(hwdb.GetDB())
@@ -256,113 +212,4 @@ func (ServiceServer) CreateTaskTemplateSubTask(ctx context.Context, req *pb.Crea
 	}, nil
 }
 
-func (ServiceServer) GetAllTaskTemplatesByCreator(ctx context.Context, req *pb.GetAllTaskTemplatesByCreatorRequest) (*pb.GetAllTaskTemplatesByCreatorResponse, error) {
-	templateRepo := task_template_repo.New(hwdb.GetDB())
-
-	// TODO: Auth
-
-	createdBy, err := uuid.Parse(req.CreatedBy)
-	err = hwdb.Error(ctx, err)
-	if err != nil {
-		return nil, err
-	}
-
-	rows, err := templateRepo.GetAllTaskTemplatesWithSubTasks(ctx, task_template_repo.GetAllTaskTemplatesWithSubTasksParams{
-		CreatorID: uuid.NullUUID{
-			UUID:  createdBy,
-			Valid: true,
-		},
-		PrivateOnly: req.GetPrivateOnly(),
-	})
-
-	err = hwdb.Error(ctx, err)
-	if err != nil {
-		return nil, err
-	}
-
-	templates := make([]*pb.GetAllTaskTemplatesByCreatorResponse_TaskTemplate, 0)
-	templateMap := make(map[uuid.UUID]int)
-
-	for _, row := range rows {
-		var template *pb.GetAllTaskTemplatesByCreatorResponse_TaskTemplate
-		if ix, found := templateMap[row.TaskTemplate.ID]; found {
-			template = templates[ix]
-		} else {
-			template = &pb.GetAllTaskTemplatesByCreatorResponse_TaskTemplate{
-				Id:          row.TaskTemplate.ID.String(),
-				Name:        row.TaskTemplate.Name,
-				Description: row.TaskTemplate.Description,
-				IsPublic:    row.TaskTemplate.WardID.Valid,
-				Subtasks:    make([]*pb.GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask, 0),
-			}
-			templates = append(templates, template)
-			templateMap[row.TaskTemplate.ID] = len(templates) - 1
-		}
-
-		if row.SubTaskName != nil {
-			template.Subtasks = append(template.Subtasks, &pb.GetAllTaskTemplatesByCreatorResponse_TaskTemplate_SubTask{
-				Name:           *row.SubTaskName,
-				TaskTemplateId: row.TaskTemplate.ID.String(),
-				Id:             row.SubTaskID.UUID.String(), // must exist by constraint
-			})
-		}
-	}
-
-	return &pb.GetAllTaskTemplatesByCreatorResponse{
-		Templates: templates,
-	}, nil
-}
-
-func (ServiceServer) GetAllTaskTemplatesByWard(ctx context.Context, req *pb.GetAllTaskTemplatesByWardRequest) (*pb.GetAllTaskTemplatesByWardResponse, error) {
-	templateRepo := task_template_repo.New(hwdb.GetDB())
-
-	wardId, err := uuid.Parse(req.WardId)
-	if err != nil {
-		return nil, status.Error(codes.InvalidArgument, err.Error())
-	}
-
-	rows, err := templateRepo.GetAllTaskTemplatesWithSubTasks(ctx, task_template_repo.GetAllTaskTemplatesWithSubTasksParams{
-		WardID: uuid.NullUUID{
-			UUID:  wardId,
-			Valid: true,
-		},
-	})
-
-	err = hwdb.Error(ctx, err)
-	if err != nil {
-		return nil, err
-	}
-
-	templates := make([]*pb.GetAllTaskTemplatesByWardResponse_TaskTemplate, 0)
-	templateMap := make(map[uuid.UUID]int)
-
-	for _, row := range rows {
-		var template *pb.GetAllTaskTemplatesByWardResponse_TaskTemplate
-		if ix, found := templateMap[row.TaskTemplate.ID]; found {
-			template = templates[ix]
-		} else {
-			template = &pb.GetAllTaskTemplatesByWardResponse_TaskTemplate{
-				Id:          row.TaskTemplate.ID.String(),
-				Name:        row.TaskTemplate.Name,
-				Description: row.TaskTemplate.Description,
-				IsPublic:    row.TaskTemplate.WardID.Valid,
-				CreatedBy:   row.TaskTemplate.CreatedBy.String(),
-				Subtasks:    make([]*pb.GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask, 0),
-			}
-			templates = append(templates, template)
-			templateMap[row.TaskTemplate.ID] = len(templates) - 1
-		}
-
-		if row.SubTaskName != nil {
-			template.Subtasks = append(template.Subtasks, &pb.GetAllTaskTemplatesByWardResponse_TaskTemplate_SubTask{
-				Name:           *row.SubTaskName,
-				TaskTemplateId: row.TaskTemplate.ID.String(),
-				Id:             row.SubTaskID.UUID.String(), // must exist by constraint
-			})
-		}
-	}
-
-	return &pb.GetAllTaskTemplatesByWardResponse{
-		Templates: templates,
-	}, nil
-}
+// TODO: GetAllTaskTemplates
diff --git a/services/tasks-svc/internal/task/api/grpc.go b/services/tasks-svc/internal/task/api/grpc.go
index a216e4541..8259d761d 100644
--- a/services/tasks-svc/internal/task/api/grpc.go
+++ b/services/tasks-svc/internal/task/api/grpc.go
@@ -31,6 +31,8 @@ func (s *TaskGrpcService) CreateTask(ctx context.Context, req *pb.CreateTaskRequ
 		return nil, err
 	}
 
+	// TODO: implement task.assigned_user_id and task.subtasks
+
 	if err := s.handlers.Commands.V1.CreateTask(ctx, taskID, req.GetName(), req.Description, patientID, req.Public, req.InitialStatus, req.DueAt); err != nil {
 		return nil, err
 	}
@@ -46,6 +48,8 @@ func (s *TaskGrpcService) UpdateTask(ctx context.Context, req *pb.UpdateTaskRequ
 		return nil, err
 	}
 
+	// TODO: implement update task.public
+
 	if err := s.handlers.Commands.V1.UpdateTask(ctx, taskID, req.Name, req.Description, req.Status); err != nil {
 		return nil, err
 	}
@@ -100,15 +104,17 @@ func (s *TaskGrpcService) GetTask(ctx context.Context, req *pb.GetTaskRequest) (
 		return nil, err
 	}
 
-	var subtasksRes []*pb.GetTaskResponse_Subtask
+	var subtasksRes []*pb.GetTaskResponse_SubTask
 	for _, subtask := range task.Subtasks {
-		subtasksRes = append(subtasksRes, &pb.GetTaskResponse_Subtask{
+		subtasksRes = append(subtasksRes, &pb.GetTaskResponse_SubTask{
 			Id:   subtask.ID.String(),
 			Name: subtask.Name,
 			Done: subtask.Done,
+			// TODO: created_by
 		})
 	}
 
+	// TODO: add missing fields
 	return &pb.GetTaskResponse{
 		Id:             task.ID.String(),
 		Name:           task.Name,
@@ -260,8 +266,8 @@ func (s *TaskGrpcService) GetAssignedTasks(ctx context.Context, _ *pb.GetAssigne
 			Subtasks:       make([]*pb.GetAssignedTasksResponse_Task_SubTask, len(item.Subtasks)),
 			AssignedUserId: item.AssignedUser.UUID.String(), // Safe, assignedUserId has to be set. TODO: #760
 			Patient: &pb.GetAssignedTasksResponse_Task_Patient{
-				Id:   item.PatientID.String(),
-				Name: item.Patient.HumanReadableIdentifier,
+				Id:                      item.PatientID.String(),
+				HumanReadableIdentifier: item.Patient.HumanReadableIdentifier,
 			},
 		}
 
@@ -290,6 +296,8 @@ func (s *TaskGrpcService) CreateSubtask(ctx context.Context, req *pb.CreateSubta
 
 	subtaskID := uuid.New()
 
+	// TODO: implement subtask.done functionality
+
 	if err := s.handlers.Commands.V1.CreateSubtask(ctx, taskID, subtaskID, req.GetSubtask().GetName()); err != nil {
 		return nil, err
 	}
@@ -305,6 +313,8 @@ func (s *TaskGrpcService) UpdateSubtask(ctx context.Context, req *pb.UpdateSubta
 		return nil, err
 	}
 
+	// TODO: implement complete and uncompleteSubtask functionality
+
 	subtaskID, err := uuid.Parse(req.GetSubtaskId())
 	if err != nil {
 		return nil, err
@@ -317,42 +327,6 @@ func (s *TaskGrpcService) UpdateSubtask(ctx context.Context, req *pb.UpdateSubta
 	return &pb.UpdateSubtaskResponse{}, nil
 }
 
-func (s *TaskGrpcService) CompleteSubtask(ctx context.Context, req *pb.CompleteSubtaskRequest) (*pb.CompleteSubtaskResponse, error) {
-	taskID, err := uuid.Parse(req.GetTaskId())
-	if err != nil {
-		return nil, err
-	}
-
-	subtaskID, err := uuid.Parse(req.GetSubtaskId())
-	if err != nil {
-		return nil, err
-	}
-
-	if err := s.handlers.Commands.V1.CompleteSubtask(ctx, taskID, subtaskID); err != nil {
-		return nil, err
-	}
-
-	return &pb.CompleteSubtaskResponse{}, nil
-}
-
-func (s *TaskGrpcService) UncompleteSubtask(ctx context.Context, req *pb.UncompleteSubtaskRequest) (*pb.UncompleteSubtaskResponse, error) {
-	taskID, err := uuid.Parse(req.GetTaskId())
-	if err != nil {
-		return nil, err
-	}
-
-	subtaskID, err := uuid.Parse(req.GetSubtaskId())
-	if err != nil {
-		return nil, err
-	}
-
-	if err := s.handlers.Commands.V1.UncompleteSubtask(ctx, taskID, subtaskID); err != nil {
-		return nil, err
-	}
-
-	return &pb.UncompleteSubtaskResponse{}, nil
-}
-
 func (s *TaskGrpcService) DeleteSubtask(ctx context.Context, req *pb.DeleteSubtaskRequest) (*pb.DeleteSubtaskResponse, error) {
 	taskID, err := uuid.Parse(req.GetTaskId())
 	if err != nil {
@@ -370,3 +344,6 @@ func (s *TaskGrpcService) DeleteSubtask(ctx context.Context, req *pb.DeleteSubta
 
 	return &pb.DeleteSubtaskResponse{}, nil
 }
+
+// TODO: add removeTaskDueDate
+// TODO: add deleteTask
diff --git a/services/tasks-svc/internal/task/api/grpc_test.go b/services/tasks-svc/internal/task/api/grpc_test.go
index 064a15009..3ea6a1b38 100644
--- a/services/tasks-svc/internal/task/api/grpc_test.go
+++ b/services/tasks-svc/internal/task/api/grpc_test.go
@@ -256,7 +256,7 @@ func TestTaskGrpcService_Subtask(t *testing.T) {
 		t.Error("subtasks should be 1")
 	}
 
-	subtasks := hwutil.Filter(getTaskResponse.Subtasks, func(value *pb.GetTaskResponse_Subtask) bool {
+	subtasks := hwutil.Filter(getTaskResponse.Subtasks, func(value *pb.GetTaskResponse_SubTask) bool {
 		return value.Id == createSubtaskResponse.GetSubtaskId()
 	})
 	subtask := subtasks[0]
@@ -279,7 +279,7 @@ func TestTaskGrpcService_Subtask(t *testing.T) {
 		t.Error(err)
 	}
 
-	subtasks = hwutil.Filter(getTaskResponse.Subtasks, func(value *pb.GetTaskResponse_Subtask) bool {
+	subtasks = hwutil.Filter(getTaskResponse.Subtasks, func(value *pb.GetTaskResponse_SubTask) bool {
 		return value.Id == createSubtaskResponse.GetSubtaskId()
 	})
 	subtask = subtasks[0]
@@ -308,7 +308,7 @@ func TestTaskGrpcService_Subtask(t *testing.T) {
 		t.Error(err)
 	}
 
-	subtasks = hwutil.Filter(getTaskResponse.Subtasks, func(value *pb.GetTaskResponse_Subtask) bool {
+	subtasks = hwutil.Filter(getTaskResponse.Subtasks, func(value *pb.GetTaskResponse_SubTask) bool {
 		return value.Id == createSubtaskResponse.GetSubtaskId()
 	})
 	subtask = subtasks[0]
@@ -317,49 +317,7 @@ func TestTaskGrpcService_Subtask(t *testing.T) {
 		t.Errorf("Invalid subtask name. Expected '%s' got '%s'", newSubtaskName, subtask.Name)
 	}
 
-	_, err = client.CompleteSubtask(ctx, &pb.CompleteSubtaskRequest{
-		TaskId:    createTaskResponse.GetId(),
-		SubtaskId: createSubtaskResponse.GetSubtaskId(),
-	})
-	if err != nil {
-		t.Error(err)
-	}
-
-	getTaskResponse, err = client.GetTask(ctx, &pb.GetTaskRequest{Id: createTaskResponse.GetId()})
-	if err != nil {
-		t.Error(err)
-	}
-
-	subtasks = hwutil.Filter(getTaskResponse.Subtasks, func(value *pb.GetTaskResponse_Subtask) bool {
-		return value.Id == createSubtaskResponse.GetSubtaskId()
-	})
-	subtask = subtasks[0]
-
-	if !subtask.Done {
-		t.Error("Subtask should be completed")
-	}
-
-	_, err = client.UncompleteSubtask(ctx, &pb.UncompleteSubtaskRequest{
-		TaskId:    createTaskResponse.GetId(),
-		SubtaskId: createSubtaskResponse.GetSubtaskId(),
-	})
-	if err != nil {
-		t.Error(err)
-	}
-
-	getTaskResponse, err = client.GetTask(ctx, &pb.GetTaskRequest{Id: createTaskResponse.GetId()})
-	if err != nil {
-		t.Error(err)
-	}
-
-	subtasks = hwutil.Filter(getTaskResponse.Subtasks, func(value *pb.GetTaskResponse_Subtask) bool {
-		return value.Id == createSubtaskResponse.GetSubtaskId()
-	})
-	subtask = subtasks[0]
-
-	if subtask.Done {
-		t.Error("Subtask should be uncompleted")
-	}
+	// TODO: test functionality of complete & uncomplete subtask which was moved to updateSubtask
 
 	_, err = client.DeleteSubtask(ctx, &pb.DeleteSubtaskRequest{
 		TaskId:    createTaskResponse.GetId(),