Add basic setup changes