Add support for custom analyzer