adapt API to the new standards