Adding in main structure