Added the start of basic user tracking in queries.