Add logger; Add sopport for offline work