Support 1.8 offline mode