Re-add will_paginate