Added query and config modules.