change structure for new feature