Modified to conform latest xtream constructor signature