Code to interface, not a concrete
Merge branch 'feature-paginator-interface-dependency' into develop