API keys stored separately. Fix #22