Add support for next and previous entries