CLSN-6 Create Query Layer
Code refactored, FileUpload module queries changed