Schema changes and notes for token verification