Fix the issue with no file existing, put it in a wrapper and make it
more generic for Enums, etc.