Better feature streams handling