Refactoring Stream wrapper register