Added per-file definitions since I'm not sure what's going on with the per-directory ones