diff --git a/layers/src/main/java/com/iluwatar/layers/CakeBakingService.java b/layers/src/main/java/com/iluwatar/layers/CakeBakingService.java
index 08902bf11..4315e3519 100644
--- a/layers/src/main/java/com/iluwatar/layers/CakeBakingService.java
+++ b/layers/src/main/java/com/iluwatar/layers/CakeBakingService.java
@@ -2,9 +2,9 @@ package com.iluwatar.layers;
 
 public interface CakeBakingService {
 	
-	void bakeNewCake(String topping, String layer1, String layer2, String layer3);
+	void bakeNewCake(CakeInfo cakeInfo);
 
-	void addNewTopping(CakeTopping topping);
+	void saveNewTopping(CakeToppingInfo toppingInfo);
 	
-	void addNewLayer(CakeLayer layer);
+	void saveNewLayer(CakeLayerInfo layerInfo);
 }
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java b/layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java
index f2d457437..fa141b5dc 100644
--- a/layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java
+++ b/layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java
@@ -3,18 +3,14 @@ package com.iluwatar.layers;
 public class CakeBakingServiceImpl implements CakeBakingService {
 
 	@Override
-	public void bakeNewCake(String topping, String layer1, String layer2, String layer3) {
+	public void bakeNewCake(CakeInfo cakeInfo) {
 	}
 
 	@Override
-	public void addNewTopping(CakeTopping topping) {
-		// TODO Auto-generated method stub
-		
+	public void saveNewTopping(CakeToppingInfo toppingInfo) {
 	}
 
 	@Override
-	public void addNewLayer(CakeLayer layer) {
-		// TODO Auto-generated method stub
-		
+	public void saveNewLayer(CakeLayerInfo layerInfo) {
 	}
 }
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeInfo.java b/layers/src/main/java/com/iluwatar/layers/CakeInfo.java
index 797bb24a1..185192f50 100644
--- a/layers/src/main/java/com/iluwatar/layers/CakeInfo.java
+++ b/layers/src/main/java/com/iluwatar/layers/CakeInfo.java
@@ -1,5 +1,14 @@
 package com.iluwatar.layers;
 
+import java.util.List;
+
 public class CakeInfo {
 
+	public final CakeToppingInfo cakeToppingInfo;
+	public final List<CakeLayerInfo> cakeLayerInfos;
+	
+	public CakeInfo(CakeToppingInfo cakeToppingInfo, List<CakeLayerInfo> cakeLayerInfos) {
+		this.cakeToppingInfo = cakeToppingInfo;
+		this.cakeLayerInfos = cakeLayerInfos;
+	}
 }
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeLayerInfo.java b/layers/src/main/java/com/iluwatar/layers/CakeLayerInfo.java
index fa74cd5f4..f2e349fe6 100644
--- a/layers/src/main/java/com/iluwatar/layers/CakeLayerInfo.java
+++ b/layers/src/main/java/com/iluwatar/layers/CakeLayerInfo.java
@@ -2,4 +2,11 @@ package com.iluwatar.layers;
 
 public class CakeLayerInfo {
 
+	public final String name;
+	public final int calories;
+
+	public CakeLayerInfo(String name, int calories) {
+		this.name = name;
+		this.calories = calories;
+	}
 }
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeToppingInfo.java b/layers/src/main/java/com/iluwatar/layers/CakeToppingInfo.java
index 32aa690cf..04ba15d98 100644
--- a/layers/src/main/java/com/iluwatar/layers/CakeToppingInfo.java
+++ b/layers/src/main/java/com/iluwatar/layers/CakeToppingInfo.java
@@ -1,5 +1,12 @@
 package com.iluwatar.layers;
 
 public class CakeToppingInfo {
+	
+	public final String name;
+	public final int calories;
 
+	public CakeToppingInfo(String name, int calories) {
+		this.name = name;
+		this.calories = calories;
+	}
 }