Added api key support