Faster updates - no buildToken method calls