#77 - Few adjustments
#77 - Changing some stuff
#77 - Comment out while not solved
#77 - Take old passport service out
#77 - Updating task
#77 - Updating stuff