Adding support for tags and properties per file