Added Spout support