changed assets loading logic from cloud