Added passport + some refactor