Samir update: adding more dependencies
640 files changed