diff --git a/events/event_port.go b/events/event_port.go
index 088a270..f9e3bc0 100644
--- a/events/event_port.go
+++ b/events/event_port.go
@@ -1,17 +1,57 @@
 package events
 
+// Port Event Start
 type PortStartEvent struct {
 	Zone      int64
-	PortCount int
+	PortCount uint16
 }
 
 func (i PortStartEvent) GetUrl() string {
-	return SERVICE_END
+	return PORT_START
 }
 
-func NewPortStartEvent(zone int64, portCount uint16) *CollectorInstallEvent {
+func NewPortStartEvent(zone int64, portCount uint16) *PortStartEvent {
 	return &PortStartEvent{
 		Zone:      zone,
 		PortCount: portCount,
 	}
 }
+
+// Port Event Found
+type PortFoundEvent struct {
+	Zone int64
+	Host int64
+	Port uint16
+	Type string
+}
+
+func (i PortFoundEvent) GetUrl() string {
+	return PORT_FOUND
+}
+
+func NewPortFoundEvent(zone int64, host int64, port uint16, t string) *PortFoundEvent {
+	return &PortFoundEvent{
+		Zone: zone,
+		Host: host,
+		Port: port,
+		Type: t,
+	}
+}
+
+// Port Event Found
+type PortEndEvent struct {
+	Zone int64
+	Host int64
+	// history ???
+}
+
+func (i PortEndEvent) GetUrl() string {
+	return PORT_START
+}
+
+func NewPortEndEvent(zone int64, host int64) *PortEndEvent {
+	return &PortEndEvent{
+		Zone: zone,
+		Host: host,
+	}
+}
diff --git a/events/event_service.go b/events/event_service.go
index 11f7207..590e63f 100644
--- a/events/event_service.go
+++ b/events/event_service.go
@@ -8,6 +8,6 @@ func (i ServiceEndEvent) GetUrl() string {
 	return SERVICE_END
 }
 
-func NewServiceEndEvent(s string) *CollectorInstallEvent {
+func NewServiceEndEvent(s string) *ServiceEndEvent {
 	return &ServiceEndEvent{ServiceName: s}
 }