refactoring embassy details