Update for icebreaker and streams initializer