Added resource assembler to fix paging