Normalized file_object to current conventions and added a few missing elements