diff --git a/uni-registrar-local/src/main/java/uniregistrar/local/extensions/Extension.java b/uni-registrar-local/src/main/java/uniregistrar/local/extensions/Extension.java
index 24c47e4b..d6d431a3 100644
--- a/uni-registrar-local/src/main/java/uniregistrar/local/extensions/Extension.java
+++ b/uni-registrar-local/src/main/java/uniregistrar/local/extensions/Extension.java
@@ -11,49 +11,30 @@
 
 public interface Extension {
 
-	public ExtensionStatus beforeCreate(String method, CreateRequest createRequest, CreateState createState, LocalUniRegistrar localUniRegistrar) throws RegistrationException;
-	public ExtensionStatus beforeUpdate(String method, UpdateRequest updateRequest, UpdateState updateState, LocalUniRegistrar localUniRegistrar) throws RegistrationException;
-	public ExtensionStatus beforeDeactivate(String method, DeactivateRequest deactivateRequest, DeactivateState deactivateState, LocalUniRegistrar localUniRegistrar) throws RegistrationException;
-	public ExtensionStatus afterCreate(String method, CreateRequest createRequest, CreateState createState, LocalUniRegistrar localUniRegistrar) throws RegistrationException;
-	public ExtensionStatus afterUpdate(String method, UpdateRequest updateRequest, UpdateState updateState, LocalUniRegistrar localUniRegistrar) throws RegistrationException;
-	public ExtensionStatus afterDeactivate(String method, DeactivateRequest deactivateRequest, DeactivateState deactivateState, LocalUniRegistrar localUniRegistrar) throws RegistrationException;
-
-	public abstract static class AbstractExtension implements Extension {
-
-		@Override
-		public ExtensionStatus beforeCreate(String method, CreateRequest createRequest, CreateState createState, LocalUniRegistrar localUniRegistrar) throws RegistrationException {
-
-			return null;
-		}
-
-		@Override
-		public ExtensionStatus beforeUpdate(String method, UpdateRequest updateRequest, UpdateState updateState, LocalUniRegistrar localUniRegistrar) throws RegistrationException {
-
-			return null;
-		}
-
-		@Override
-		public ExtensionStatus beforeDeactivate(String method, DeactivateRequest deactivateRequest, DeactivateState deactivateState, LocalUniRegistrar localUniRegistrar) throws RegistrationException {
-
-			return null;
-		}
+	public default ExtensionStatus beforeCreate(String method, CreateRequest createRequest, CreateState createState, LocalUniRegistrar localUniRegistrar) throws RegistrationException {
+		return null;
+	}
 
-		@Override
-		public ExtensionStatus afterCreate(String method, CreateRequest createRequest, CreateState createState, LocalUniRegistrar localUniRegistrar) throws RegistrationException {
+	public default ExtensionStatus beforeUpdate(String method, UpdateRequest updateRequest, UpdateState updateState, LocalUniRegistrar localUniRegistrar) throws RegistrationException {
+		return null;
+	}
 
-			return null;
-		}
+	public default ExtensionStatus beforeDeactivate(String method, DeactivateRequest deactivateRequest, DeactivateState deactivateState, LocalUniRegistrar localUniRegistrar) throws RegistrationException {
+		return null;
+	}
 
-		@Override
-		public ExtensionStatus afterUpdate(String method, UpdateRequest updateRequest, UpdateState updateState, LocalUniRegistrar localUniRegistrar) throws RegistrationException {
+	public default ExtensionStatus afterCreate(String method, CreateRequest createRequest, CreateState createState, LocalUniRegistrar localUniRegistrar) throws RegistrationException {
+		return null;
+	}
 
-			return null;
-		}
+	public default ExtensionStatus afterUpdate(String method, UpdateRequest updateRequest, UpdateState updateState, LocalUniRegistrar localUniRegistrar) throws RegistrationException {
+		return null;
+	}
 
-		@Override
-		public ExtensionStatus afterDeactivate(String method, DeactivateRequest deactivateRequest, DeactivateState deactivateState, LocalUniRegistrar localUniRegistrar) throws RegistrationException {
+	public default ExtensionStatus afterDeactivate(String method, DeactivateRequest deactivateRequest, DeactivateState deactivateState, LocalUniRegistrar localUniRegistrar) throws RegistrationException {
+		return null;
+	}
 
-			return null;
-		}
+	public abstract static class AbstractExtension implements Extension {
 	}
 }
diff --git a/uni-registrar-local/src/main/java/uniregistrar/local/extensions/impl/DummyExtension.java b/uni-registrar-local/src/main/java/uniregistrar/local/extensions/impl/DummyExtension.java
index 174f27c3..cc66fab6 100644
--- a/uni-registrar-local/src/main/java/uniregistrar/local/extensions/impl/DummyExtension.java
+++ b/uni-registrar-local/src/main/java/uniregistrar/local/extensions/impl/DummyExtension.java
@@ -2,12 +2,11 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import uniregistrar.RegistrationException;
 import uniregistrar.local.LocalUniRegistrar;
 import uniregistrar.local.extensions.Extension;
-import uniregistrar.local.extensions.ExtensionStatus;
 import uniregistrar.local.extensions.Extension.AbstractExtension;
+import uniregistrar.local.extensions.ExtensionStatus;
 import uniregistrar.request.CreateRequest;
 import uniregistrar.state.CreateState;
 
@@ -15,10 +14,10 @@ public class DummyExtension extends AbstractExtension implements Extension {
 
 	private static Logger log = LoggerFactory.getLogger(DummyExtension.class);
 
+	@Override
 	public ExtensionStatus afterCreate(String method, CreateRequest createRequest, CreateState createState, LocalUniRegistrar localUniRegistrar) throws RegistrationException {
 
 		if (log.isDebugEnabled()) log.debug("Dummy extension called!");
-
 		return ExtensionStatus.DEFAULT;
 	}
 }