[refs pivotaltracker:68490248] Added pagination