directives and services updated to pass paging