Changed scope of classes