Changes accommodate updated API