Much better structure handling