Automated some more setup