Moved to using Files instead of strings