Improve query API of features