Added default pagination support