Some structure edits