Changes for uspto support