Updates to setup