diff --git a/generator/src/main/java/org/sudu/protogen/generator/type/RegisteredType.java b/generator/src/main/java/org/sudu/protogen/generator/type/RegisteredType.java
index e412864..6124d18 100644
--- a/generator/src/main/java/org/sudu/protogen/generator/type/RegisteredType.java
+++ b/generator/src/main/java/org/sudu/protogen/generator/type/RegisteredType.java
@@ -6,7 +6,7 @@
 
 import java.util.Arrays;
 
-public class RegisteredType extends TypeModel {
+public class RegisteredType extends DomainType {
 
     private final TypeName protoType;
 
diff --git a/tests/src/test/proto/general.proto b/tests/src/test/proto/general.proto
index 893cf0e..102ca11 100644
--- a/tests/src/test/proto/general.proto
+++ b/tests/src/test/proto/general.proto
@@ -43,4 +43,9 @@ message GrpcTask {
 message GrpcTasksBatch {
   GrpcBatchId id = 1;
   repeated GrpcTask tasks = 2 [(.protogen.repeated_container) = SET];
+}
+
+message GrpcRegisteredMapList {
+  map<string, google.protobuf.Timestamp> m = 1;
+  repeated google.protobuf.Timestamp l = 2;
 }
\ No newline at end of file