Substantial usage refactoring of the remote module