Revamped the UserDAO component