Updating Spruce code