Changed how API links are setup