Change api key system to be more general for data associated with clients