Added 'offline' divertion support