Changed around in the structure of objects