Add support for square brackets