Added (de)normalization for files