enhanced directive + added Files service