Support for new, better feature query API