Preparing for new scheme