Few enhancements
Better dynamic file