VolModel restructure