Check out this thread, there is currently no system driven way to provide this, only way is to add a stream - but doing that gives more flexibility.
My stream is hopefully going to be as follows: