This is the part I'm not happy about. Any hints to do it better? Leaving 'email' in cv will cause Connection model changes.