Changes for AppFog