Reworking object structure... again!