Added list-flexibility