Added bracket support