Added structural changes