Preparations for implementing the new interface