Update to support alternates