Tokens - better code hash handling