Startet to use the new refatored api.