Added support for curly braces