Added some initial offline support