Move setup to separate script