CLSN-6 Create Query Layer

Stakeholders queries moved