Proper object structure + filling in the gaps