Refactored entity unit streams