Changed structure for front-end.