Module API additions and conversion of some modules to use them

Module API additions and conversion of some modules to use them #21093