Updated struct builder