Major update to structure