added associations and acts_as_authentication