Refactoring the API, as it can no longer be initialized with keys assoc with single Org.