Simplified udefine.inject.add calls
Updated generated files