Use new interfaces