Update to support latest Spout refactor

Signed-off-by: Steven Downer <Grinch@outlook.com>