Switched to the module/class def model