Added pagination support to listings