Improve file extension management