Add Trusted Query support
Add Trusted Query test coverage