Another refactoring. Direct streaming and shortcuts for important functions.