Update to auto detect