Adding file upload and paging support