Working on the infrastructure document