diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..ed8eafed
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Version of the OntoUML Plugin and Visual Paradigm**
+Plugin: 
+Visual Paradigm:
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+   
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..02674bfd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Version of Visual Paradigm and OntoUML Plugin**
+Plugin:
+Visual Paradigm:
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
index 9ac51e49..453a5f19 100644
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -21,6 +21,7 @@
 public class MavenWrapperDownloader {
 
   private static final String WRAPPER_VERSION = "0.5.6";
+
   /** Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. */
   private static final String DEFAULT_DOWNLOAD_URL =
       "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ProjectConfigurations.java b/src/main/java/it/unibz/inf/ontouml/vp/model/ProjectConfigurations.java
index bd5c18e8..44a29863 100644
--- a/src/main/java/it/unibz/inf/ontouml/vp/model/ProjectConfigurations.java
+++ b/src/main/java/it/unibz/inf/ontouml/vp/model/ProjectConfigurations.java
@@ -10,7 +10,9 @@
  * @author Claudenir Fonseca
  * @author Victor Viola
  */
-/** @author Victor Viola */
+/**
+ * @author Victor Viola
+ */
 public class ProjectConfigurations {
 
   public static final boolean DEFAULT_IS_PLUGIN_ENABLED = true;
diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/ModelElement.java b/src/main/java/it/unibz/inf/ontouml/vp/model/uml/ModelElement.java
index 9e6736d6..6348097e 100644
--- a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/ModelElement.java
+++ b/src/main/java/it/unibz/inf/ontouml/vp/model/uml/ModelElement.java
@@ -64,13 +64,19 @@ static boolean isPresentInOntoumlDiagram(IModelElement element) {
     return ModelElement.getDiagrams(element).stream().anyMatch(Diagram::isOntoUMLDiagram);
   }
 
-  /** @return <code>IModelElement</code> on which the object is based. */
+  /**
+   * @return <code>IModelElement</code> on which the object is based.
+   */
   public IModelElement getSourceModelElement();
 
-  /** @return object's type in OntoUML Schema. */
+  /**
+   * @return object's type in OntoUML Schema.
+   */
   public String getOntoUMLType();
 
-  /** @return object's ID (based on a <code>IModelElement</code>). */
+  /**
+   * @return object's ID (based on a <code>IModelElement</code>).
+   */
   public String getId();
 
   /**
diff --git a/src/main/java/it/unibz/inf/ontouml/vp/utils/VPContextUtils.java b/src/main/java/it/unibz/inf/ontouml/vp/utils/VPContextUtils.java
index 533c7c17..8aaacbc3 100644
--- a/src/main/java/it/unibz/inf/ontouml/vp/utils/VPContextUtils.java
+++ b/src/main/java/it/unibz/inf/ontouml/vp/utils/VPContextUtils.java
@@ -7,7 +7,9 @@
 
 public class VPContextUtils {
 
-  /** @return a set including selected model elements of the same type */
+  /**
+   * @return a set including selected model elements of the same type
+   */
   public static Set<IModelElement> getModelElements(VPContext context) {
     if (isDiagramContext(context)) {
       return Diagram.getSelectedModelElements(context.getDiagram(), getModelType(context));