Added query hooks; Reformatted exporters and formatters;