Add support for logicalFilePath attribute
Fix include with set logicalFilePath attribute