Adding option to disable pagination