diff --git a/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/AbstractStartupObserver.java b/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/AbstractStartupObserver.java
index 618a9d2..d2882f4 100644
--- a/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/AbstractStartupObserver.java
+++ b/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/AbstractStartupObserver.java
@@ -22,7 +22,6 @@
 import org.apache.myfaces.extensions.cdi.core.api.config.CodiConfig;
 import org.apache.myfaces.extensions.cdi.core.api.config.CodiCoreConfig;
 import org.apache.myfaces.extensions.cdi.core.api.config.ConfigEntry;
-import org.apache.myfaces.extensions.cdi.core.api.logging.Logger;
 import org.apache.myfaces.extensions.cdi.core.impl.util.ProxyUtils;
 
 import javax.inject.Inject;
@@ -30,14 +29,14 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Logger;
 
 /**
  * Base implementation for startup observers
  */
 public abstract class AbstractStartupObserver
 {
-    @Inject
-    protected Logger logger;
+    protected Logger logger = Logger.getLogger(getClass().getName());
 
     @Inject
     protected CodiCoreConfig codiCoreConfig;
diff --git a/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java b/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java
index 9784e78..693cf10 100644
--- a/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java
+++ b/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java
@@ -18,6 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.bv.impl;
 
+import javax.enterprise.inject.Typed;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorFactory;
 import java.io.Serializable;
@@ -28,6 +29,7 @@
  * {@link ConstraintValidatorFactory} which can be serialized and adds support for dependency injection in
  * {@link ConstraintValidator} instances.
  */
+@Typed()
 class InjectableConstraintValidatorFactory implements ConstraintValidatorFactory, Serializable
 {
     private static final long serialVersionUID = -4851853797257005554L;
diff --git a/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java b/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java
index f123bf9..2d01411 100644
--- a/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java
+++ b/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java
@@ -18,6 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.bv.impl;
 
+import javax.enterprise.inject.Typed;
 import javax.validation.MessageInterpolator;
 import java.io.Serializable;
 import java.util.Locale;
@@ -25,6 +26,7 @@
 /**
  * {@link MessageInterpolator} which can be serialized
  */
+@Typed()
 class InjectableMessageInterpolator implements MessageInterpolator, Serializable
 {
     private static final long serialVersionUID = -68329117991255147L;
diff --git a/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java b/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java
index 03f49eb..0b53519 100644
--- a/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java
+++ b/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java
@@ -18,6 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.bv.impl;
 
+import javax.enterprise.inject.Typed;
 import javax.validation.ConstraintViolation;
 import javax.validation.Validator;
 import javax.validation.metadata.BeanDescriptor;
@@ -27,6 +28,7 @@
 /**
  * {@link Validator} which can be serialized
  */
+@Typed()
 class InjectableValidator implements Validator, Serializable
 {
     private static final long serialVersionUID = 7925077169313672595L;
diff --git a/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java b/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java
index bd9c6b0..975830b 100644
--- a/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java
+++ b/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java
@@ -18,6 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.bv.impl;
 
+import javax.enterprise.inject.Typed;
 import javax.validation.ValidatorFactory;
 import javax.validation.Validator;
 import javax.validation.ValidatorContext;
@@ -29,6 +30,7 @@
 /**
  * {@link ValidatorFactory} which can be serialized
  */
+@Typed()
 class InjectableValidatorFactory implements ValidatorFactory, Serializable
 {
     private static final long serialVersionUID = 2200415478496396632L;
diff --git a/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/InvalidValueAwareMessageInterpolator.java b/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/InvalidValueAwareMessageInterpolator.java
index 3b6f0cf..b271cc4 100644
--- a/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/InvalidValueAwareMessageInterpolator.java
+++ b/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/InvalidValueAwareMessageInterpolator.java
@@ -18,7 +18,6 @@
  */
 package org.apache.myfaces.extensions.cdi.jsf.impl.bv;
 
-import org.apache.myfaces.extensions.cdi.core.api.logging.Logger;
 import org.apache.myfaces.extensions.cdi.jsf.api.Jsf;
 import org.apache.myfaces.extensions.cdi.message.api.MessageContext;
 import org.apache.myfaces.extensions.cdi.message.api.MessageResolver;
@@ -32,6 +31,7 @@
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.logging.Logger;
 
 /**
  * Allows to use 'invalidValue' as placeholder in violation messages
@@ -41,15 +41,14 @@
 {
     private static final String INVALID_VALUE_KEY = "invalidValue";
 
+    private static final Logger LOGGER = Logger.getLogger(InvalidValueAwareMessageInterpolator.class.getName());
+
     private MessageInterpolator wrapped;
 
     @Inject
     @Jsf
     private MessageContext messageContext;
 
-    @Inject
-    private Logger logger;
-
     protected InvalidValueAwareMessageInterpolator()
     {
     }
@@ -134,7 +133,7 @@
         String warnMessage = constraintName + " uses 'invalidValue' as custom constraint attribute." +
                 "So it isn't possible to use it as implicit key in the violation message.";
 
-        this.logger.warning(warnMessage);
+        LOGGER.warning(warnMessage);
     }
 
     private Map<String, Serializable> getCustomAttributesOfConstraint(Map<String, Object> attributesOfConstraint)
diff --git a/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/InvalidValueAwareValidatorContext.java b/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/InvalidValueAwareValidatorContext.java
index 162203c..07edfa8 100644
--- a/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/InvalidValueAwareValidatorContext.java
+++ b/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/InvalidValueAwareValidatorContext.java
@@ -21,6 +21,7 @@
 import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;
 import org.apache.myfaces.extensions.cdi.jsf.impl.bv.InvalidValueAwareMessageInterpolator;
 
+import javax.enterprise.inject.Typed;
 import javax.validation.MessageInterpolator;
 import javax.validation.ValidatorContext;
 import javax.validation.TraversableResolver;
@@ -32,6 +33,7 @@
  * {@link ValidatorContext} which allows to use 'invalidValue' as placeholder in violation messages
  */
 //TODO move to a different package
+@Typed()
 class InvalidValueAwareValidatorContext implements ValidatorContext
 {
     private ValidatorContext wrapped;
diff --git a/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/JsfValidatorFactoryProducer.java b/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/JsfValidatorFactoryProducer.java
index 82d0388..02c0fb2 100644
--- a/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/JsfValidatorFactoryProducer.java
+++ b/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/JsfValidatorFactoryProducer.java
@@ -18,6 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.jsf.impl.bv.resolver;
 
+import org.apache.myfaces.extensions.cdi.core.api.Advanced;
 import org.apache.myfaces.extensions.cdi.jsf.api.config.JsfModuleConfig;
 
 import javax.enterprise.context.ApplicationScoped;
@@ -46,6 +47,7 @@
 
     @Produces
     @Dependent
+    @Advanced
     @Named(BEAN_VALIDATION_VALIDATOR_FACTORY)
     public ValidatorFactory createValidatorFactory(JsfModuleConfig jsfModuleConfig)
     {