Remove attr support, Add single querier