Started multiple list support - for #2 and for #3