Some structure improvements