Added list support
Added comment