Refactor user dao