Updates to initial setup