Got cloud model working with local storage again