Add fall-back configurability for latest addition.