pretty re-ordered cloud storage models, no db refresh