Complete replacement the module API