Add db and pagination