updated to use data models. AIRAVATA-1032