Impl for latest Gunsmith changes