Added initial pagination