Update to match latest Spout changes