Add lists supports
Cosmetic fixes