Added support for multiple bracket/brace types (x), [x], {x}