More internal updates