diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 630fd25c0..4ea9cdd73 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -27,7 +27,9 @@ jobs:
       id: checkout
       run: .github/scripts/checkout.sh update-generated-files-${{ github.sha }}
     - name: Generate signatures
-      run: mvn package -Psignature-generation --file tck/pom.xml
+      run: |
+        mvn install --file tck/pom.xml
+        mvn package -Psignature-generation --file tck/pom.xml
     ## Add any other automated update steps here
     - name: Needs updates
       id: update
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index 9934fd121..d310c9fac 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -8,6 +8,16 @@ and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Version
 
 == [Unreleased]
 
+== [1.0.0-M3] - 2024-01-30
+
+=== Changed
+
+- Updated specification to allow for deleteAll() with no parameters to be valid
+- Changed the default count() method to be countBy()
+- Introduced @Delete annotation to the default deleteAll() method
+- Restricted @Update and @Delete return types for numeric types to only int and long
+- Re-introduced static metamodel
+
 == [1.0.0-M2] - 2023-11-31
 
 === Changed
diff --git a/tck/src/main/resources/ee/jakarta/tck/data/framework/signature/jakarta.data.sig_17 b/tck/src/main/resources/ee/jakarta/tck/data/framework/signature/jakarta.data.sig_17
index 820cb6374..df6ea06fe 100644
--- a/tck/src/main/resources/ee/jakarta/tck/data/framework/signature/jakarta.data.sig_17
+++ b/tck/src/main/resources/ee/jakarta/tck/data/framework/signature/jakarta.data.sig_17
@@ -93,6 +93,28 @@ hfds serialVersionUID
 
 CLSS abstract interface jakarta.data.exceptions.package-info
 
+CLSS public abstract interface jakarta.data.metamodel.Attribute
+meth public abstract java.lang.String name()
+
+CLSS public abstract interface jakarta.data.metamodel.SortableAttribute
+intf jakarta.data.metamodel.Attribute
+meth public abstract jakarta.data.Sort asc()
+meth public abstract jakarta.data.Sort desc()
+
+CLSS public abstract interface !annotation jakarta.data.metamodel.StaticMetamodel
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE])
+intf java.lang.annotation.Annotation
+meth public abstract java.lang.Class<?> value()
+
+CLSS public abstract interface jakarta.data.metamodel.TextAttribute
+intf jakarta.data.metamodel.SortableAttribute
+meth public abstract jakarta.data.Sort ascIgnoreCase()
+meth public abstract jakarta.data.Sort descIgnoreCase()
+
+CLSS abstract interface jakarta.data.metamodel.package-info
+
 CLSS abstract interface jakarta.data.package-info
 
 CLSS public abstract interface jakarta.data.page.KeysetAwarePage<%0 extends java.lang.Object>
@@ -168,10 +190,11 @@ meth public abstract boolean existsById({jakarta.data.repository.BasicRepository
 meth public abstract java.util.Optional<{jakarta.data.repository.BasicRepository%0}> findById({jakarta.data.repository.BasicRepository%1})
 meth public abstract java.util.stream.Stream<{jakarta.data.repository.BasicRepository%0}> findAll()
 meth public abstract java.util.stream.Stream<{jakarta.data.repository.BasicRepository%0}> findByIdIn(java.lang.Iterable<{jakarta.data.repository.BasicRepository%1}>)
-meth public abstract long count()
+meth public abstract long countBy()
 meth public abstract void delete({jakarta.data.repository.BasicRepository%0})
  anno 0 jakarta.data.repository.Delete()
 meth public abstract void deleteAll()
+ anno 0 jakarta.data.repository.Delete()
 meth public abstract void deleteAll(java.lang.Iterable<? extends {jakarta.data.repository.BasicRepository%0}>)
  anno 0 jakarta.data.repository.Delete()
 meth public abstract void deleteById({jakarta.data.repository.BasicRepository%1})
diff --git a/tck/src/main/resources/ee/jakarta/tck/data/framework/signature/jakarta.data.sig_21 b/tck/src/main/resources/ee/jakarta/tck/data/framework/signature/jakarta.data.sig_21
index bbb7913cd..e4f019be4 100644
--- a/tck/src/main/resources/ee/jakarta/tck/data/framework/signature/jakarta.data.sig_21
+++ b/tck/src/main/resources/ee/jakarta/tck/data/framework/signature/jakarta.data.sig_21
@@ -93,6 +93,28 @@ hfds serialVersionUID
 
 CLSS abstract interface jakarta.data.exceptions.package-info
 
+CLSS public abstract interface jakarta.data.metamodel.Attribute
+meth public abstract java.lang.String name()
+
+CLSS public abstract interface jakarta.data.metamodel.SortableAttribute
+intf jakarta.data.metamodel.Attribute
+meth public abstract jakarta.data.Sort asc()
+meth public abstract jakarta.data.Sort desc()
+
+CLSS public abstract interface !annotation jakarta.data.metamodel.StaticMetamodel
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE])
+intf java.lang.annotation.Annotation
+meth public abstract java.lang.Class<?> value()
+
+CLSS public abstract interface jakarta.data.metamodel.TextAttribute
+intf jakarta.data.metamodel.SortableAttribute
+meth public abstract jakarta.data.Sort ascIgnoreCase()
+meth public abstract jakarta.data.Sort descIgnoreCase()
+
+CLSS abstract interface jakarta.data.metamodel.package-info
+
 CLSS abstract interface jakarta.data.package-info
 
 CLSS public abstract interface jakarta.data.page.KeysetAwarePage<%0 extends java.lang.Object>
@@ -168,10 +190,11 @@ meth public abstract boolean existsById({jakarta.data.repository.BasicRepository
 meth public abstract java.util.Optional<{jakarta.data.repository.BasicRepository%0}> findById({jakarta.data.repository.BasicRepository%1})
 meth public abstract java.util.stream.Stream<{jakarta.data.repository.BasicRepository%0}> findAll()
 meth public abstract java.util.stream.Stream<{jakarta.data.repository.BasicRepository%0}> findByIdIn(java.lang.Iterable<{jakarta.data.repository.BasicRepository%1}>)
-meth public abstract long count()
+meth public abstract long countBy()
 meth public abstract void delete({jakarta.data.repository.BasicRepository%0})
  anno 0 jakarta.data.repository.Delete()
 meth public abstract void deleteAll()
+ anno 0 jakarta.data.repository.Delete()
 meth public abstract void deleteAll(java.lang.Iterable<? extends {jakarta.data.repository.BasicRepository%0}>)
  anno 0 jakarta.data.repository.Delete()
 meth public abstract void deleteById({jakarta.data.repository.BasicRepository%1})