update to support latest API