diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/configuration/Configuration.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/configuration/Configuration.java
index 71b1918..743c098 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/configuration/Configuration.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/configuration/Configuration.java
@@ -47,7 +47,7 @@ import javax.enterprise.inject.Stereotype;
 import javax.enterprise.util.Nonbinding;
 import javax.inject.Named;
 
-import br.gov.frameworkdemoiselle.annotation.StaticScoped;
+import br.gov.frameworkdemoiselle.lifecycle.StaticScoped;
 
 /**
  * Identifies a <b>configuration class</b>, that is, a structure reserved to store configuration values retrieved from a
diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/stereotype/ViewController.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/stereotype/ViewController.java
index 32bc92c..0e233db 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/stereotype/ViewController.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/stereotype/ViewController.java
@@ -46,7 +46,7 @@ import java.lang.annotation.Target;
 import javax.enterprise.inject.Stereotype;
 import javax.inject.Named;
 
-import br.gov.frameworkdemoiselle.annotation.ViewScoped;
+import br.gov.frameworkdemoiselle.lifecycle.ViewScoped;
 
 /**
  * Identifies a <b>view controller</b> class. A view controller class is intend to respond to events initiated in the
diff --git a/impl/core/src/test/java/lifecycle/shutdown/simple/ShutdownSimple.java b/impl/core/src/test/java/lifecycle/shutdown/simple/ShutdownSimple.java
index b8b7680..4011659 100644
--- a/impl/core/src/test/java/lifecycle/shutdown/simple/ShutdownSimple.java
+++ b/impl/core/src/test/java/lifecycle/shutdown/simple/ShutdownSimple.java
@@ -36,8 +36,8 @@
  */
 package lifecycle.shutdown.simple;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.enterprise.context.ApplicationScoped;
 
@@ -46,9 +46,9 @@ import br.gov.frameworkdemoiselle.lifecycle.Shutdown;
 @ApplicationScoped
 public class ShutdownSimple {
 
-	private List<Integer> listShutdown = new ArrayList<Integer>();
+	private Set<Integer> listShutdown = new HashSet<Integer>();
 
-	public List<Integer> getListShutdown() {
+	public Set<Integer> getSet() {
 		return listShutdown;
 	}
 
diff --git a/impl/core/src/test/java/lifecycle/shutdown/simple/ShutdownSimpleTest.java b/impl/core/src/test/java/lifecycle/shutdown/simple/ShutdownSimpleTest.java
index a50ab1b..7dd051f 100644
--- a/impl/core/src/test/java/lifecycle/shutdown/simple/ShutdownSimpleTest.java
+++ b/impl/core/src/test/java/lifecycle/shutdown/simple/ShutdownSimpleTest.java
@@ -36,8 +36,8 @@
  */
 package lifecycle.shutdown.simple;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.inject.Inject;
 
@@ -60,7 +60,7 @@ public class ShutdownSimpleTest {
 	@Inject
 	private ShutdownSimple shutdownSimple;
 
-	List<Integer> expected = new ArrayList<Integer>();
+	private Set<Integer> expected = new HashSet<Integer>();
 
 	@Deployment
 	public static JavaArchive createDeployment() {
@@ -80,6 +80,6 @@ public class ShutdownSimpleTest {
 		expected.add(2);
 		expected.add(1);
 
-		Assert.assertEquals(expected, shutdownSimple.getListShutdown());
+		Assert.assertEquals(expected, shutdownSimple.getSet());
 	}
 }
diff --git a/impl/core/src/test/java/lifecycle/startup/simple/StartupSimple.java b/impl/core/src/test/java/lifecycle/startup/simple/StartupSimple.java
index 760476b..ca0cd4c 100644
--- a/impl/core/src/test/java/lifecycle/startup/simple/StartupSimple.java
+++ b/impl/core/src/test/java/lifecycle/startup/simple/StartupSimple.java
@@ -36,8 +36,8 @@
  */
 package lifecycle.startup.simple;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.enterprise.context.ApplicationScoped;
 
@@ -46,9 +46,9 @@ import br.gov.frameworkdemoiselle.lifecycle.Startup;
 @ApplicationScoped
 public class StartupSimple {
 
-	private List<Integer> listStartup = new ArrayList<Integer>();
+	private Set<Integer> listStartup = new HashSet<Integer>();
 
-	public List<Integer> getListStartup() {
+	public Set<Integer> getSet() {
 		return listStartup;
 	}
 
diff --git a/impl/core/src/test/java/lifecycle/startup/simple/StartupSimpleTest.java b/impl/core/src/test/java/lifecycle/startup/simple/StartupSimpleTest.java
index 4305d60..0739f4e 100644
--- a/impl/core/src/test/java/lifecycle/startup/simple/StartupSimpleTest.java
+++ b/impl/core/src/test/java/lifecycle/startup/simple/StartupSimpleTest.java
@@ -36,8 +36,8 @@
  */
 package lifecycle.startup.simple;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.inject.Inject;
 
@@ -60,7 +60,7 @@ public class StartupSimpleTest {
 	@Inject
 	private StartupSimple startupSimple;
 
-	List<Integer> expected = new ArrayList<Integer>();
+	private Set<Integer> expected = new HashSet<Integer>();
 
 	@Deployment
 	public static JavaArchive createDeployment() {
@@ -80,6 +80,6 @@ public class StartupSimpleTest {
 		expected.add(3);
 		expected.add(2);
 
-		Assert.assertEquals(expected, startupSimple.getListStartup());
+		Assert.assertEquals(expected, startupSimple.getSet());
 	}
 }
diff --git a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ViewEntityManagerStore.java b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ViewEntityManagerStore.java
index 7c81ba6..27198bc 100644
--- a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ViewEntityManagerStore.java
+++ b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ViewEntityManagerStore.java
@@ -39,7 +39,7 @@ package br.gov.frameworkdemoiselle.internal.producer;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 
-import br.gov.frameworkdemoiselle.annotation.ViewScoped;
+import br.gov.frameworkdemoiselle.lifecycle.ViewScoped;
 
 /**
  * 
--
libgit2 0.21.2