Change object format + structs to comply to specs