Adjusted to support { } list syntax