Refactored to use StreamsLocalBuilder