Changes to work within CloudApp environment, still needs mavenization.