Add support for multiple lists