Changed structure of loaders