Updated to new spout api