diff --git a/compose_viz/parser.py b/compose_viz/parser.py
index d3a9afa..b46cb9f 100644
--- a/compose_viz/parser.py
+++ b/compose_viz/parser.py
@@ -18,28 +18,31 @@ class Parser:
                 yaml_data = yaml.load(f)
             except Exception as e:
                 raise RuntimeError(f"Error parsing file '{file_path}': {e}")
-
         # validate the yaml file
         if not yaml_data:
             raise RuntimeError("Empty yaml file, aborting.")
-
         if not yaml_data.get("services"):
             raise RuntimeError("No services found, aborting.")
 
         # parse services data into Service objects
         services_data = yaml_data["services"]
+        services = self.parse_service_data(yaml_data["services"])
+
+        # create Compose object
+        compose = Compose(services)
+
+        return compose
+
+    def parse_service_data(self, services_yaml_data: List):
         services = []
-
-        for service, service_name in zip(services_data.values(), services_data.keys()):
-            print("name: {}".format(service_name))
-
+        for service, service_name in zip(services_yaml_data.values(), services_yaml_data.keys()):
+            
             service_image: Optional[str] = None
             if service.get("image"):
                 service_image = service["image"]
-                print("image: {}".format(service_image))
             elif service.get("build"):
                 service_image = "build from " + service["build"]
-                print("image: {}".format(service_image))
+                
 
             service_networks: List[str] = []
             if service.get("networks"):
@@ -47,23 +50,40 @@ class Parser:
                     service_networks = service["networks"]
                 else:
                     service_networks = list(service["networks"].keys())
-                print("networks: {}".format(service_networks))
-
-            service_image: Optional[str] = None
-            if service.get("image"):
-                service_image = service["image"]
-                print("image: {}".format(service_image))
+                
 
             service_extends: Optional[Extends] = None
             if service.get("extends"):
                 service_extends = Extends(service_name=service["extends"]["service"])
-                print("extends: {}".format(service_extends))
+                
+
+            service_ports: List[str] = []
+            if service.get("ports"):
+                service_ports = service["ports"]
+
+            service_depends_on: List[str] = []
+            if service.get("depends_on"):
+                service_depends_on = service["depends_on"]
 
             services.append(
-                Service(name=service_name, image=service_image, networks=service_networks, extends=service_extends)
+                Service(
+                    name=service_name,
+                    image=service_image,
+                    networks=service_networks,
+                    extends=service_extends,
+                    ports=service_ports,
+                    depends_on=service_depends_on,
+                )
             )
+            # Service print debug
+            #print("--------------------")
+            #print("Service name: {}".format(service_name))
+            #print("image: {}".format(service_image))
+            #print("networks: {}".format(service_networks))
+            #print("image: {}".format(service_image))
+            #print("extends: {}".format(service_extends))
+            #print("ports: {}".format(service_ports))
+            #print("depends: {}".format(service_depends_on))
 
-        # create Compose object
-        compose = Compose(services)
 
-        return compose
+        return services