Refactor to StreamFeed module