Added warnings with offline support