Added before first and after first add to stream hooks too