Update setup and logging