Completed Offline support :D
Fixed values to follow convention