adapted latest changes to interfaces