Adds some more Dao and Gateway stuff as well as the Iterator for the Account