Added simplified structure