Add new structure for simplicity