Update to match current dev enviro setup