Readd TOKEN_LENGTH