Changes
Switch to using UUID for model identification