Added file resolve feature