Improvements:

Separate passport strategy