[UPDATE] Added pagination