Refactored tags with source-stream helper