Added curly bracket support, still untested