Changed logic of class loading.