Updated file structure, included more data