Updated to handle project changes. AIRAVATA-1182