Add support for GSD in query