Finish updating all modules to the new API