Added pagination and filters