Added support for 'next' links