Adding passport, refactoring structure