JWT changes