Update for Spout entity changes