Changed token serialization parser to accept @ sign in the token string