Added brackets as token boundaries