[Changing #54528410] Adding dropbox support; Fixing some mistakes in model classes