Add pagination, small deco