Adapt to the new Interface