Changes for adding api keys