Unnecessary properties removed from Query object. Code dataset added.
Added scalar function references and resolver, not fully functional yet.