Add ability to pass 'limit