Added pagination and search