Update (V1.1.0) for ONLINE/OFFLINE support