Issue #15 step five implementation. External files support