Add support for Long lists