diff --git a/spring-data-yugabytedb-ysql/src/main/java/com/yugabyte/data/jdbc/repository/YsqlRepository.java b/spring-data-yugabytedb-ysql/src/main/java/com/yugabyte/data/jdbc/repository/YsqlRepository.java
index 0620b56..484c855 100644
--- a/spring-data-yugabytedb-ysql/src/main/java/com/yugabyte/data/jdbc/repository/YsqlRepository.java
+++ b/spring-data-yugabytedb-ysql/src/main/java/com/yugabyte/data/jdbc/repository/YsqlRepository.java
@@ -14,6 +14,7 @@
 
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.NoRepositoryBean;
+import org.springframework.data.repository.PagingAndSortingRepository;
 
 /**
  * Extending {@link CrudRepository} to support additional methods specific to
@@ -22,7 +23,7 @@
  * @author Nikhil Chandrappa
  */
 @NoRepositoryBean
-public interface YsqlRepository<T, ID> extends CrudRepository<T, ID> {
+public interface YsqlRepository<T, ID> extends PagingAndSortingRepository<T, ID> {
 	
 	long count();