Adds paging and filter by id support