Update basic infrastructure