Small update to prevent timeout
Start of some puppets