Files, regular expressions, traits added