Add more basic setup