Updated api to be a single instance