refactored DB for passport