Restructure passport as part of initializers.