diff --git a/vpc-interface-endpoint/route53.tf b/vpc-interface-endpoint/route53.tf
index c8ca54e..87f0f26 100644
--- a/vpc-interface-endpoint/route53.tf
+++ b/vpc-interface-endpoint/route53.tf
@@ -63,8 +63,7 @@ resource "null_resource" "vpce" {
 }
 
 data "aws_network_interface" "vpce" {
-  #  for_each = local.r53_create ? toset(aws_vpc_endpoint.interface_endpoint.network_interface_ids) : toset([])
-  for_each = local.r53_create && local.endpoint_exists ? toset(split(",", null_resource.vpce.triggers.vpce_interface_ids)) : toset([])
+  for_each = local.endpoint_exists ? toset(split(",", null_resource.vpce.triggers.vpce_interface_ids)) : toset([])
   id       = each.key
 }
 
@@ -159,19 +158,23 @@ resource "aws_route53_record" "vpce_ptr_info" {
 }
 
 resource "aws_ssm_parameter" "vpce" {
-  count       = local.r53_create ? 1 : 0
+  #  count       = local.r53_create ? 1 : 0
+  count       = local.has_service ? 1 : 0
   name        = format("/enterprise/%v/vpc-endpoints/%v/%v", data.aws_arn.current.partition, local.region, data.aws_vpc_endpoint_service.interface_endpoint.service)
   description = format("VPC Endpoint details for %v", data.aws_vpc_endpoint_service.interface_endpoint.service)
   type        = "String"
   value = jsonencode({
-    name         = data.aws_vpc_endpoint_service.interface_endpoint.service
-    region       = local.region
-    dns_name     = local.domain_name
-    id           = aws_vpc_endpoint.interface_endpoint.id
-    zone         = try(aws_route53_zone.vpce[0].name, null)
-    zone_id      = try(aws_route53_zone.vpce[0].zone_id, null)
-    create_time  = try(time_static.vpce[0].unix, null)
-    ip_addresses = try([for n in data.aws_network_interface.vpce : n.private_ip], [])
+    name                 = data.aws_vpc_endpoint_service.interface_endpoint.service
+    region               = local.region
+    dns_name             = local.domain_name
+    id                   = aws_vpc_endpoint.interface_endpoint.id
+    zone_exists          = local.r53_create
+    zone                 = try(aws_route53_zone.vpce[0].name, null)
+    zone_id              = try(aws_route53_zone.vpce[0].zone_id, null)
+    create_time          = try(time_static.vpce[0].unix, null)
+    ip_addresses         = try([for n in data.aws_network_interface.vpce : n.private_ip], [])
+    endpoint_cidr_blocks = try(aws_vpc_endpoint.interface_endpoint.cidr_blocks, [])
+    endpoint_dns_name    = try(aws_vpc_endpoint.interface_endpoint.dns_entry[0].dns_name, null)
   })
 
   tags = merge(