Added elementary files support