rej14: Fix errors with previous commit

 * Move wrong contributions from HandleSecurity to EncryptData
 * Mark double contributions as alternatives
 * Re-copy into certain model