Tweak to require more lengthy tokens