Changes in structure handling functions