Initial changes to key_helper tool.