User and Link DAO changes