Enabled paging. Added identity mapping