added new structure for front-end