Updated replace( ) and providers( )