Preparing support for both /list and /live