Add spout implementation, not tested