Added named structure support