Add support for allow-query