Enhancement : Refreshing Streams on change

Fixes #506 #473.