Update the base modules to use the new API