SRAMP-29 StoredQuery support

And here.