Fix after merge
CloudFacade fix after merge; CloudFactory using class variables