Small updates regarding list handling as a compositions.