Changes for updated API