Updates to setup procedures