Fix Conflicts with EAV model