Feature/military addresses