Preparation for new module API