Data model fix.