Initial API key support, new exceptions