Construct the structure better