diff --git a/src/main/java/de/maishai/typedast/typedclass/TypedClass.java b/src/main/java/de/maishai/typedast/typedclass/TypedClass.java
index 9ee61c5..e1680e7 100644
--- a/src/main/java/de/maishai/typedast/typedclass/TypedClass.java
+++ b/src/main/java/de/maishai/typedast/typedclass/TypedClass.java
@@ -13,9 +13,12 @@ import java.util.Map;
 
 @Data
 public class TypedClass implements Node {
+    private Boolean isPublic;
     private TypedId typedId;
     private List<TypedField> typedFields;
     private List<TypedMethod> typedMethods;
+    private TypedMainMethod typedMainMethod;
+    private List<TypedConstructor> typedConstructors;
 
     @Override
     public Type typeCheck(Map<String, Type> localVar, Map<String, TypedClass> classes) {
diff --git a/src/main/java/de/maishai/typedast/typedclass/TypedConstructor.java b/src/main/java/de/maishai/typedast/typedclass/TypedConstructor.java
index 317163c..192bacc 100644
--- a/src/main/java/de/maishai/typedast/typedclass/TypedConstructor.java
+++ b/src/main/java/de/maishai/typedast/typedclass/TypedConstructor.java
@@ -12,6 +12,7 @@ import java.util.Map;
 @Data
 public class TypedConstructor implements Node {
 
+    private Boolean isPublic;
     private TypedId typedId;
     private List<TypedParameter> typedParameters;
     private TypedBlock typedBlock;
diff --git a/src/main/java/de/maishai/typedast/typedclass/TypedFieldId.java b/src/main/java/de/maishai/typedast/typedclass/TypedFieldId.java
index e9402d2..cdfd6de 100644
--- a/src/main/java/de/maishai/typedast/typedclass/TypedFieldId.java
+++ b/src/main/java/de/maishai/typedast/typedclass/TypedFieldId.java
@@ -8,7 +8,7 @@ import lombok.Data;
 
 import java.util.Map;
 @Data
-public class TypedFieldId implements Node {
+public class TypedFieldId implements Expression {
     private Boolean field;
     private Expression recipient;
     private TypedId typedId;
diff --git a/src/main/java/de/maishai/typedast/typedclass/TypedMethod.java b/src/main/java/de/maishai/typedast/typedclass/TypedMethod.java
index ec5a90c..8668e44 100644
--- a/src/main/java/de/maishai/typedast/typedclass/TypedMethod.java
+++ b/src/main/java/de/maishai/typedast/typedclass/TypedMethod.java
@@ -13,6 +13,7 @@ import java.util.Map;
 
 @Data
 public class TypedMethod implements Node {
+    private Boolean isPublic;
     private TypedId typedId;
     private Type returnType;
     private List<TypedParameter> typedParameters;