Added association between authenticator and user, and user and target
Better error checking
Comments