Added more utils and streams