started to introduce pagination (API layer first)