[FIX] Starting migration of mason2 to new stream module.