Remove mixins, add StrongAuthentification and Beneficiary models