Stream cleanup & underlying map customization

As discussed