More structure improvements