diff --git a/LatticeDehomogenization/src/main.cpp b/LatticeDehomogenization/src/main.cpp
index 6ddb21bdc33ce9657e416fed33d199f438b4ef85..0e3585d53ecb2aeedd872be8b5c1c7ec08664629 100644
--- a/LatticeDehomogenization/src/main.cpp
+++ b/LatticeDehomogenization/src/main.cpp
@@ -24,9 +24,9 @@ int main(int argc, char** argv)
 	{
 		std::cout << "[Info](main) Error(s) occured while reading command line arguments" << std::endl;
 		cmdlnParser.dumpErrors();
-			RETURN_MSG;
-			return 1;
-		}
+		RETURN_MSG;
+		return 1;
+	}
 
 	// Parse Input
 	ParseInputFile inputParser(cmdlnParser);
@@ -49,24 +49,24 @@ int main(int argc, char** argv)
 	}
 
 	// Build Lattice
-	BuildLattice<UnitCellBCC>* builder = nullptr;
+	BuildLattice* builder = nullptr;
 	switch (latticeType.getLatticeType())
 	{
 	case LatticeType::SimpleUniform:
 	case LatticeType::SimpleNonuniform:
 		std::cout << "[Info](main) Building Simple Lattice" << std::endl;
-		builder = new BuilderSimpleLattice<UnitCellBCC>(latticeType.getLatticeData<SimpleLatticeData>());
+		builder = new BuilderSimpleLattice(latticeType.getCellType(), latticeType.getLatticeData<SimpleLatticeData>());
 		break;
 
 	case LatticeType::GenericUniform:
 	case LatticeType::GenericNonuniform:
 		std::cout << "[Info](main) Building Generic Lattice" << std::endl;
-		builder = new BuilderGenericLattice<UnitCellBCC>(latticeType.getLatticeData<GenericLatticeData>());
+		builder = new BuilderGenericLattice(latticeType.getCellType(), latticeType.getLatticeData<GenericLatticeData>());
 		break;
 
 	case LatticeType::ProjectedCartesian:
 		std::cout << "[Info](main) Building Projected Lattice" << std::endl;
-		builder = new BuilderProjectedLattice<UnitCellBCC>(latticeType.getLatticeData<ProjectedLatticeData>());
+		builder = new BuilderProjectedLattice(latticeType.getCellType(), latticeType.getLatticeData<ProjectedLatticeData>());
 		break;
 
 	default:
@@ -74,6 +74,8 @@ int main(int argc, char** argv)
 		RETURN_MSG;
 		return 1;
 	}
+
+	
 	builder->buildLattice();
 	if (builder->hasErrors())
 	{
diff --git a/bin/LatticeDehomogenization.exe b/bin/LatticeDehomogenization.exe
index 9b5cf76b0522c6fad426020f0276819b3095aad2..30345e7b8a6df4d6906a651cf14bb1b9fbc9c911 100644
Binary files a/bin/LatticeDehomogenization.exe and b/bin/LatticeDehomogenization.exe differ