Adding code to extensions module, and adding masking of queries.