More work on API key management and character import