Added options for limit and page