Fixed up API keys and added counter entities