Preparing for new interface