Added string support and skipping escape sequences