Offline improvements