diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7b3eb9f..84f5f87 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,9 +4,7 @@
 #   you may not use this file except in compliance with the License.
 #   You may obtain a copy of the License at
 #     http://www.apache.org/licenses/LICENSE-2.0
-
-#   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
-
+#
 #   Unless required by applicable law or agreed to in writing, software
 #   distributed under the License is distributed on an "AS IS" BASIS,
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index f4c5e5f..d578d2a 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -4,9 +4,7 @@
 #   you may not use this file except in compliance with the License.
 #   You may obtain a copy of the License at
 #     http://www.apache.org/licenses/LICENSE-2.0
-
-#   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
-
+#
 #   Unless required by applicable law or agreed to in writing, software
 #   distributed under the License is distributed on an "AS IS" BASIS,
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5e729c3..3e57f3c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,17 +1,15 @@
-## Licensed to Muhammad Hamadto
-#
-##   Licensed under the Apache License, Version 2.0 (the "License");
-##   you may not use this file except in compliance with the License.
-##   You may obtain a copy of the License at
-##     http://www.apache.org/licenses/LICENSE-2.0
-#
-##   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
+# Licensed to Muhammad Hamadto
+
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-##   Unless required by applicable law or agreed to in writing, software
-##   distributed under the License is distributed on an "AS IS" BASIS,
-##   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-##   See the License for the specific language governing permissions and
-##   limitations under the License.
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
 
 
 name: Publish package to GitHub Packages
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 9bd7d17..2cfd5bd 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -6,8 +6,6 @@
 #   You may obtain a copy of the License at
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
-#   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
-#
 #   Unless required by applicable law or agreed to in writing, software
 #   distributed under the License is distributed on an "AS IS" BASIS,
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/LICENSE b/LICENSE
index 1404a9b..7ba8bb6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -5,8 +5,6 @@ Licensed to Muhammad Hamadto
   You may obtain a copy of the License at
     http://www.apache.org/licenses/LICENSE-2.0
 
-  See the NOTICE file distributed with this work for additional information regarding copyright ownership.
-
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/mvnw b/mvnw
index f1521e5..5a8013a 100755
--- a/mvnw
+++ b/mvnw
@@ -7,8 +7,6 @@
 #   You may obtain a copy of the License at
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
-#   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
-#
 #   Unless required by applicable law or agreed to in writing, software
 #   distributed under the License is distributed on an "AS IS" BASIS,
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/pom.xml b/pom.xml
index a1e9535..5b30b59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,8 +7,6 @@
   ~   You may obtain a copy of the License at
   ~     http://www.apache.org/licenses/LICENSE-2.0
   ~
-  ~   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
-  ~
   ~   Unless required by applicable law or agreed to in writing, software
   ~   distributed under the License is distributed on an "AS IS" BASIS,
   ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +23,7 @@
   <groupId>cloud.pianola</groupId>
   <artifactId>cdk-fluent-assertions</artifactId>
   <name>CDK Fluent Assertions</name>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
   <packaging>jar</packaging>
   <description>AssertJ-like fluent assertions for AWS CDK testing</description>
   <url>https://github.com/muhamadto/cdk-fluent-assertions</url>
@@ -183,9 +181,6 @@
         You may obtain a copy of the License at
         https://www.apache.org/licenses/LICENSE-2.0
 
-        See the NOTICE file distributed with this work for additional information regarding
-        copyright ownership.
-
         Unless required by applicable law or agreed to in writing, software
         distributed under the License is distributed on an "AS IS" BASIS,
         WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/CDKStackAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/CDKStackAssert.java
index 13fe7ee..502ceb1 100644
--- a/src/main/java/cloud/pianola/cdk/fluent/assertion/CDKStackAssert.java
+++ b/src/main/java/cloud/pianola/cdk/fluent/assertion/CDKStackAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -120,7 +118,9 @@ public RestApiAccountAssert containsRestApiAccountWithCloudWatchRoleArn(
 
     final Map<String, Map<String, Object>> properties = Map.of(
         "Properties", Map.of(
-            "CloudWatchRoleArn", Map.of("Fn::GetAtt", List.of(cloudWatchRoleArn, "Arn"))
+            "CloudWatchRoleArn", Map.of(
+                "Fn::GetAtt", List.of(stringLikeRegexp(cloudWatchRoleArn), "Arn")
+            )
         )
     );
 
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/CdkResourceType.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/CdkResourceType.java
index 8223c76..c4aeb24 100644
--- a/src/main/java/cloud/pianola/cdk/fluent/assertion/CdkResourceType.java
+++ b/src/main/java/cloud/pianola/cdk/fluent/assertion/CdkResourceType.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/LambdaAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/LambdaAssert.java
index 0aca1a8..603ca0e 100644
--- a/src/main/java/cloud/pianola/cdk/fluent/assertion/LambdaAssert.java
+++ b/src/main/java/cloud/pianola/cdk/fluent/assertion/LambdaAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/LambdaEventInvokeConfigAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/LambdaEventInvokeConfigAssert.java
index 53c1e6d..4d432c8 100644
--- a/src/main/java/cloud/pianola/cdk/fluent/assertion/LambdaEventInvokeConfigAssert.java
+++ b/src/main/java/cloud/pianola/cdk/fluent/assertion/LambdaEventInvokeConfigAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/LambdaPermissionAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/LambdaPermissionAssert.java
index 4e200a1..e86b914 100644
--- a/src/main/java/cloud/pianola/cdk/fluent/assertion/LambdaPermissionAssert.java
+++ b/src/main/java/cloud/pianola/cdk/fluent/assertion/LambdaPermissionAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/PolicyAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/PolicyAssert.java
index 0ed1a53..d5fcea8 100644
--- a/src/main/java/cloud/pianola/cdk/fluent/assertion/PolicyAssert.java
+++ b/src/main/java/cloud/pianola/cdk/fluent/assertion/PolicyAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/QueueAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/QueueAssert.java
index fd5c275..711afa6 100644
--- a/src/main/java/cloud/pianola/cdk/fluent/assertion/QueueAssert.java
+++ b/src/main/java/cloud/pianola/cdk/fluent/assertion/QueueAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/QueuePolicyAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/QueuePolicyAssert.java
index 7b2cca4..d63eaa8 100644
--- a/src/main/java/cloud/pianola/cdk/fluent/assertion/QueuePolicyAssert.java
+++ b/src/main/java/cloud/pianola/cdk/fluent/assertion/QueuePolicyAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/RestApiAccountAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/RestApiAccountAssert.java
index 9d04112..471b7fb 100644
--- a/src/main/java/cloud/pianola/cdk/fluent/assertion/RestApiAccountAssert.java
+++ b/src/main/java/cloud/pianola/cdk/fluent/assertion/RestApiAccountAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/RestApiAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/RestApiAssert.java
index 2808893..de3aa5c 100644
--- a/src/main/java/cloud/pianola/cdk/fluent/assertion/RestApiAssert.java
+++ b/src/main/java/cloud/pianola/cdk/fluent/assertion/RestApiAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/RoleAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/RoleAssert.java
index 9db097f..7436407 100644
--- a/src/main/java/cloud/pianola/cdk/fluent/assertion/RoleAssert.java
+++ b/src/main/java/cloud/pianola/cdk/fluent/assertion/RoleAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/TopicAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/TopicAssert.java
index aad7be2..8ca39d8 100644
--- a/src/main/java/cloud/pianola/cdk/fluent/assertion/TopicAssert.java
+++ b/src/main/java/cloud/pianola/cdk/fluent/assertion/TopicAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/TopicSubscriptionAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/TopicSubscriptionAssert.java
index aa78777..e81141e 100644
--- a/src/main/java/cloud/pianola/cdk/fluent/assertion/TopicSubscriptionAssert.java
+++ b/src/main/java/cloud/pianola/cdk/fluent/assertion/TopicSubscriptionAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.