Change ConvertToList to handle scalars as well