Added paging map/unmap support