adding underscore and suport for multiple app streams