Additional files and changes