Moved towards using RMStream for extra stream-specific data