Offline addresses correct support