Added 'query' configuration mode and skeleton input method