Changed structure of classes