diff --git a/src/main/java/org/jd/core/v1/printer/PlainTextMetaPrinter.java b/src/main/java/org/jd/core/v1/printer/PlainTextMetaPrinter.java
index 3e5497fa..7a93ae56 100644
--- a/src/main/java/org/jd/core/v1/printer/PlainTextMetaPrinter.java
+++ b/src/main/java/org/jd/core/v1/printer/PlainTextMetaPrinter.java
@@ -7,6 +7,8 @@
 
 package org.jd.core.v1.printer;
 
+import java.util.Optional;
+
 public class PlainTextMetaPrinter extends PlainTextPrinter {
     // --- Printer --- //
     @Override
@@ -35,7 +37,7 @@ public void printReference(int type, String internalTypeName, String name, Strin
         sb.append("<META-REFERENCE type='");
         printType(type);
         sb.append("' internalName='");
-        sb.append(internalTypeName==null ? "?" : internalTypeName);
+        sb.append(Optional.ofNullable(internalTypeName).orElse("?"));
         sb.append("' descriptor='");
         sb.append(descriptor);
         sb.append("' ownerInternalName='");
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/cfg/Loop.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/cfg/Loop.java
index 72b400a0..76d20284 100644
--- a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/cfg/Loop.java
+++ b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/cfg/Loop.java
@@ -8,6 +8,7 @@
 
 import java.util.Iterator;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 
 public class Loop {
@@ -89,6 +90,6 @@ public String toString() {
             }
         }
 
-        return str + "], end=" + (end ==null ? "" : end.getIndex()) + "}";
+        return str + "], end=" + Optional.ofNullable(end).map(BasicBlock::getIndex).orElse(-1) + "}";
     }
 }
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileAnnotationDeclaration.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileAnnotationDeclaration.java
index d09a0e9f..3d896935 100644
--- a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileAnnotationDeclaration.java
+++ b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileAnnotationDeclaration.java
@@ -10,12 +10,14 @@
 import org.jd.core.v1.model.javasyntax.declaration.AnnotationDeclaration;
 import org.jd.core.v1.model.javasyntax.reference.BaseAnnotationReference;
 
+import java.util.Optional;
+
 public class ClassFileAnnotationDeclaration extends AnnotationDeclaration implements ClassFileTypeDeclaration {
     private final int firstLineNumber;
 
     public ClassFileAnnotationDeclaration(BaseAnnotationReference annotationReferences, int flags, String internalName, String name, ClassFileBodyDeclaration bodyDeclaration) {
         super(annotationReferences, flags, internalName, name, null, bodyDeclaration);
-        this.firstLineNumber = bodyDeclaration==null ? 0 : bodyDeclaration.getFirstLineNumber();
+        this.firstLineNumber = Optional.ofNullable(bodyDeclaration).map(ClassFileMemberDeclaration::getFirstLineNumber).orElse(0);
     }
 
     @Override
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileClassDeclaration.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileClassDeclaration.java
index ac650155..04b6a85a 100644
--- a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileClassDeclaration.java
+++ b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileClassDeclaration.java
@@ -13,12 +13,14 @@
 import org.jd.core.v1.model.javasyntax.type.BaseTypeParameter;
 import org.jd.core.v1.model.javasyntax.type.ObjectType;
 
+import java.util.Optional;
+
 public class ClassFileClassDeclaration extends ClassDeclaration implements ClassFileTypeDeclaration {
     private final int firstLineNumber;
 
     public ClassFileClassDeclaration(BaseAnnotationReference annotationReferences, int flags, String internalName, String name, BaseTypeParameter typeParameters, ObjectType superType, BaseType interfaces, ClassFileBodyDeclaration bodyDeclaration) {
         super(annotationReferences, flags, internalName, name, typeParameters, superType, interfaces, bodyDeclaration);
-        this.firstLineNumber = bodyDeclaration==null ? 0 : bodyDeclaration.getFirstLineNumber();
+        this.firstLineNumber = Optional.ofNullable(bodyDeclaration).map(ClassFileMemberDeclaration::getFirstLineNumber).orElse(0);
     }
 
     @Override
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileEnumDeclaration.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileEnumDeclaration.java
index 70d7c170..97d822db 100644
--- a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileEnumDeclaration.java
+++ b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileEnumDeclaration.java
@@ -14,13 +14,14 @@
 import org.jd.core.v1.model.javasyntax.type.BaseType;
 
 import java.util.List;
+import java.util.Optional;
 
 public class ClassFileEnumDeclaration extends EnumDeclaration implements ClassFileTypeDeclaration {
     private final int firstLineNumber;
 
     public ClassFileEnumDeclaration(BaseAnnotationReference annotationReferences, int flags, String internalName, String name, BaseType interfaces, ClassFileBodyDeclaration bodyDeclaration) {
         super(annotationReferences, flags, internalName, name, interfaces, null, bodyDeclaration);
-        this.firstLineNumber = bodyDeclaration==null ? 0 : bodyDeclaration.getFirstLineNumber();
+        this.firstLineNumber = Optional.ofNullable(bodyDeclaration).map(ClassFileMemberDeclaration::getFirstLineNumber).orElse(0);
     }
 
     public void setFlags(int flags) {
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileInterfaceDeclaration.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileInterfaceDeclaration.java
index ff6bdcee..e32ce8ec 100644
--- a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileInterfaceDeclaration.java
+++ b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileInterfaceDeclaration.java
@@ -12,12 +12,14 @@
 import org.jd.core.v1.model.javasyntax.type.BaseType;
 import org.jd.core.v1.model.javasyntax.type.BaseTypeParameter;
 
+import java.util.Optional;
+
 public class ClassFileInterfaceDeclaration extends InterfaceDeclaration implements ClassFileTypeDeclaration {
     private final int firstLineNumber;
 
     public ClassFileInterfaceDeclaration(BaseAnnotationReference annotationReferences, int flags, String internalName, String name, BaseTypeParameter typeParameters, BaseType interfaces, ClassFileBodyDeclaration bodyDeclaration) {
         super(annotationReferences, flags, internalName, name, typeParameters, interfaces, bodyDeclaration);
-        this.firstLineNumber = bodyDeclaration==null ? 0 : bodyDeclaration.getFirstLineNumber();
+        this.firstLineNumber = Optional.ofNullable(bodyDeclaration).map(ClassFileMemberDeclaration::getFirstLineNumber).orElse(0);
     }
 
     @Override
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ByteCodeParser.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ByteCodeParser.java
index 2d80ab08..74e5af33 100644
--- a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ByteCodeParser.java
+++ b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ByteCodeParser.java
@@ -1408,7 +1408,7 @@ private void parseInvokeDynamic(Statements statements, DefaultStack<Expression>
         ConstantNameAndType indyCnat = constants.getConstant(constantMemberRef.getNameAndTypeIndex());
         String indyMethodName = constants.getConstantString(indyCnat.getNameIndex(), CONSTANT_Utf8);
         String indyDescriptor = constants.getConstantString(indyCnat.getSignatureIndex(), CONSTANT_Utf8);
-        TypeMaker.MethodTypes indyMethodTypes = typeMaker.makeMethodTypes(indyDescriptor);
+        TypeMaker.MethodTypes indyMethodTypes = typeMaker.makeMethodTypes(internalTypeName, indyMethodName, indyDescriptor);
         
         BaseExpression indyParameters = extractParametersFromStack(statements, stack, indyMethodTypes.getParameterTypes());
         BootstrapMethod bootstrapMethod = attributeBootstrapMethods.getBootstrapMethods()[constantMemberRef.getClassIndex()];
@@ -1428,7 +1428,7 @@ private void parseInvokeDynamic(Statements statements, DefaultStack<Expression>
 
         ConstantMethodType cmt0 = constants.getConstant(bootstrapArguments[0]);
         String descriptor0 = constants.getConstantString(cmt0.getDescriptorIndex(), CONSTANT_Utf8);
-        TypeMaker.MethodTypes methodTypes0 = typeMaker.makeMethodTypes(descriptor0);
+        TypeMaker.MethodTypes methodTypes0 = typeMaker.makeMethodTypes(internalTypeName, null, descriptor0);
         int parameterCount = methodTypes0.getParameterTypes() == null ? 0 : methodTypes0.getParameterTypes().size();
         ConstantMethodHandle constantMethodHandle1 = constants.getConstant(bootstrapArguments[1]);
         ConstantCP cmr1 = constants.getConstant(constantMethodHandle1.getReferenceIndex());
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ByteCodeWriter.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ByteCodeWriter.java
index 060accb7..ae75d824 100644
--- a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ByteCodeWriter.java
+++ b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ByteCodeWriter.java
@@ -25,6 +25,7 @@
 import org.apache.bcel.classfile.LineNumberTable;
 import org.apache.bcel.classfile.LocalVariable;
 import org.apache.bcel.classfile.LocalVariableTable;
+import org.apache.bcel.classfile.LocalVariableTypeTable;
 import org.apache.bcel.classfile.Method;
 import org.jd.core.v1.model.javasyntax.expression.BooleanExpression;
 import org.jd.core.v1.model.javasyntax.expression.StringConstantExpression;
@@ -34,7 +35,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.Optional;
 import java.util.TreeMap;
+import java.util.stream.Stream;
 
 import static org.apache.bcel.Const.ALOAD;
 import static org.apache.bcel.Const.ANEWARRAY;
@@ -522,21 +525,22 @@ protected void writeLocalVariableTable(String linePrefix, StringBuilder sb, Code
             }
         }
 
-//        LocalVariableTypeTable localVariableTypeTable = attributeCode.getLocalVariableTypeTable();
-//
-//        if (localVariableTypeTable != null) {
-//            sb.append(linePrefix).append("Local variable type table:\n");
-//            sb.append(linePrefix).append("  start\tlength\tslot\tname\tsignature\n");
-//
-//            for (LocalVariable localVariable : localVariableTypeTable.getLocalVariableTypeTable()) {
-//                sb.append(linePrefix).append("  ");
-//                sb.append(localVariable.getStartPC()).append('\t');
-//                sb.append(localVariable.getLength()).append('\t');
-//                sb.append(localVariable.getIndex()).append('\t');
-//                sb.append(localVariable.getName()).append('\t');
-//                sb.append(localVariable.getSignature()).append('\n');
-//            }
-//        }
+        LocalVariableTypeTable localVariableTypeTable = (LocalVariableTypeTable) Optional.ofNullable(attributeCode.getAttributes())
+                .map(Stream::of).orElseGet(Stream::empty).filter(LocalVariableTypeTable.class::isInstance).findAny().orElse(null);
+
+        if (localVariableTypeTable != null) {
+            sb.append(linePrefix).append("Local variable type table:\n");
+            sb.append(linePrefix).append("  start\tlength\tslot\tname\tsignature\n");
+
+            for (LocalVariable localVariable : localVariableTypeTable.getLocalVariableTypeTable()) {
+                sb.append(linePrefix).append("  ");
+                sb.append(localVariable.getStartPC()).append('\t');
+                sb.append(localVariable.getLength()).append('\t');
+                sb.append(localVariable.getIndex()).append('\t');
+                sb.append(localVariable.getName()).append('\t');
+                sb.append(localVariable.getSignature()).append('\n');
+            }
+        }
     }
 
     protected void writeExceptionTable(String linePrefix, StringBuilder sb, ConstantPool constants, Code attributeCode) {