Refactoring to support new cloud app style
Adding
Updating dependencies