Removed explicit Link Handler interface
Move stream name down to handlers