Added DAO for Edge and various other improvements.