General structure improvements