Added support of other bracket kinds