diff --git a/Dockerfile b/Dockerfile
index 673090f..7aa32d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,8 +28,5 @@ FROM scratch
 COPY --from=builder /filesystem-datalayer .
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 
-# Expose port 8090 to the outside world
-EXPOSE 8090
-
 # Command to run the executable
 CMD ["./filesystem-datalayer"]
\ No newline at end of file
diff --git a/layer.go b/layer.go
index fa731e7..871f116 100644
--- a/layer.go
+++ b/layer.go
@@ -451,7 +451,7 @@ func (f *FileCollectionEntityIterator) Next() (*egdm.Entity, cdl.LayerError) {
 	if item == nil {
 		return nil, nil
 	} else {
-		entity := &egdm.Entity{Properties: make(map[string]any)}
+		entity := egdm.NewEntity()
 		err := f.mapper.MapItemToEntity(item, entity)
 		if err != nil {
 			return nil, cdl.Err(fmt.Errorf("could not map item to entity because %s", err.Error()), cdl.LayerErrorInternal)