Even more work on Object diagram.