Changing main api to be more key dependent