Updated structure for testing