Changed Object structure