Update API to FIRST/NEXT
Merge branch 'feature-modify-api-for-first-next'