Added AWS, data files and adapted interactors