Added more files and properties