#1 Initial addition of pagination service
#1 Additional changes