Improved handling of system files