Changed structure for future