Updates to structure and sample data