Add feature to paginate